aboutsummaryrefslogtreecommitdiff
path: root/src/libappindicator/app-indicator.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-11 16:18:48 -0600
committerTed Gould <ted@gould.cx>2010-03-11 16:18:48 -0600
commit837d67948cfa29fc99f5b1336c8ef0ca1eb45e99 (patch)
tree921181b7e62b0a95efc9312f87564338c51745ce /src/libappindicator/app-indicator.c
parent9504966c66f3241612afe27b52fcd8745052afa2 (diff)
parentbf1f1526eb6d0c220dba945d42ab72c6f6a1d636 (diff)
downloadlibayatana-appindicator-837d67948cfa29fc99f5b1336c8ef0ca1eb45e99.tar.gz
libayatana-appindicator-837d67948cfa29fc99f5b1336c8ef0ca1eb45e99.tar.bz2
libayatana-appindicator-837d67948cfa29fc99f5b1336c8ef0ca1eb45e99.zip
* Upstream release 0.0.16
* Use libindicator icon loading helper * Workaround for label changes on GtkActions * Testing fix for using xvfb
Diffstat (limited to 'src/libappindicator/app-indicator.c')
-rw-r--r--src/libappindicator/app-indicator.c33
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);