diff options
author | Sebastien Bacher <seb128@ubuntu.com> | 2010-03-11 23:48:08 +0100 |
---|---|---|
committer | Sebastien Bacher <seb128@ubuntu.com> | 2010-03-11 23:48:08 +0100 |
commit | 04fecf21cb26bc72be233e24684b065f9572f036 (patch) | |
tree | 917a005d553cc16c50cd2e728d75fbc7f51e2c18 /src/libappindicator | |
parent | 8dcf6e3c998de10b8989d5a66308c3dd424668e9 (diff) | |
parent | 0be5c8bcef961b60a8748ebdc63adc9a98cb8aef (diff) | |
download | libayatana-appindicator-04fecf21cb26bc72be233e24684b065f9572f036.tar.gz libayatana-appindicator-04fecf21cb26bc72be233e24684b065f9572f036.tar.bz2 libayatana-appindicator-04fecf21cb26bc72be233e24684b065f9572f036.zip |
releasing version 0.0.16-0ubuntu10.0.16-0ubuntu1
Diffstat (limited to 'src/libappindicator')
-rw-r--r-- | src/libappindicator/app-indicator.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index ef9f5c0..5edc9fe 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -1160,6 +1160,21 @@ widget_notify_cb (GtkWidget *widget, } static void +action_notify_cb (GtkAction *action, + GParamSpec *pspec, + gpointer data) +{ + DbusmenuMenuitem *child = (DbusmenuMenuitem *)data; + + if (pspec->name == g_intern_static_string ("label")) + { + dbusmenu_menuitem_property_set (child, + DBUSMENU_MENUITEM_PROP_LABEL, + gtk_action_get_label (action)); + } +} + +static void container_iterate (GtkWidget *widget, gpointer data) { @@ -1281,6 +1296,24 @@ container_iterate (GtkWidget *widget, g_signal_connect (widget, "notify", G_CALLBACK (widget_notify_cb), child); + if (GTK_IS_ACTIVATABLE (widget)) + { + GtkActivatable *activatable = GTK_ACTIVATABLE (widget); + + if (gtk_activatable_get_use_action_appearance (activatable)) + { + GtkAction *action = gtk_activatable_get_related_action (activatable); + + if (action) + { + g_signal_connect_object (action, "notify", + G_CALLBACK (action_notify_cb), + child, + G_CONNECT_AFTER); + } + } + } + g_signal_connect (G_OBJECT (child), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_menuitem), widget); |