diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-11 23:41:33 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-11 23:41:33 -0600 |
| commit | ed18ce8a163c96d74ecef1b2414687ecf6285a49 (patch) | |
| tree | a25c61f55d704511c740d7162b2dd28a66f7dc56 | |
| parent | c1010b61c9097212c9631b6cbc4e85fd62539364 (diff) | |
| parent | e979943578891555904bfad9f452ed9c6c7aadda (diff) | |
| download | libayatana-appindicator-ed18ce8a163c96d74ecef1b2414687ecf6285a49.tar.gz libayatana-appindicator-ed18ce8a163c96d74ecef1b2414687ecf6285a49.tar.bz2 libayatana-appindicator-ed18ce8a163c96d74ecef1b2414687ecf6285a49.zip | |
* Upstream Merge
* Sensitivity to label changes
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | example/simple-client.c | 14 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 24 |
3 files changed, 45 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ab6faac..27071f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.7-0ubuntu1~ppa2) UNRELEASED; urgency=low + + * Upstream Merge + * Sensitivity to label changes + + -- Ted Gould <ted@ubuntu.com> Mon, 11 Jan 2010 23:41:03 -0600 + indicator-application (0.0.7-0ubuntu1~ppa1) karmic; urgency=low * Upstream Release 0.0.7 diff --git a/example/simple-client.c b/example/simple-client.c index 8ce9fba..b1d9fc2 100644 --- a/example/simple-client.c +++ b/example/simple-client.c @@ -34,6 +34,15 @@ item_clicked_cb (GtkWidget *widget, gpointer data) g_print ("%s clicked!\n", text); } +static void +toggle_sensitivity_cb (GtkWidget *widget, gpointer data) +{ + GtkWidget *target = (GtkWidget *)data; + + gtk_menu_item_set_label (GTK_MENU_ITEM (target), "modified!!"); + gtk_widget_set_sensitive (target, !GTK_WIDGET_IS_SENSITIVE (target)); +} + int main (int argc, char ** argv) { @@ -68,6 +77,11 @@ main (int argc, char ** argv) G_CALLBACK (item_clicked_cb), "3"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + GtkWidget *toggle_item = gtk_menu_item_new_with_label ("Toggle 3"); + g_signal_connect (toggle_item, "activate", + G_CALLBACK (toggle_sensitivity_cb), item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), toggle_item); + app_indicator_set_menu (ci, GTK_MENU (menu)); mainloop = g_main_loop_new(NULL, FALSE); diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 7560a97..f115068 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -740,6 +740,27 @@ menuitem_iterate (GtkWidget *widget, } static void +widget_notify_cb (GtkWidget *widget, + GParamSpec *pspec, + gpointer data) +{ + DbusmenuMenuitem *child = (DbusmenuMenuitem *)data; + + if (pspec->name == g_intern_static_string ("sensitive")) + { + dbusmenu_menuitem_property_set_bool (child, + DBUSMENU_MENUITEM_PROP_SENSITIVE, + GTK_WIDGET_IS_SENSITIVE (widget)); + } + else if (pspec->name == g_intern_static_string ("label")) + { + dbusmenu_menuitem_property_set (child, + DBUSMENU_MENUITEM_PROP_LABEL, + gtk_menu_item_get_label (GTK_MENU_ITEM (widget))); + } +} + +static void container_iterate (GtkWidget *widget, gpointer data) { @@ -826,6 +847,9 @@ container_iterate (GtkWidget *widget, } } + g_signal_connect (widget, "notify", + G_CALLBACK (widget_notify_cb), child); + g_signal_connect (G_OBJECT (child), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_menuitem), widget); |