From 27a7bb9a2b8518f2ff02e14fac1aaabca4aafaf5 Mon Sep 17 00:00:00 2001
From: Jan Arne Petersen <jpetersen@openismus.com>
Date: Mon, 8 Mar 2010 13:53:17 +0100
Subject: Listen also to label changes on actions related to menu items to
 workaround a gtk+ bug.

---
 src/libappindicator/app-indicator.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

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
@@ -1159,6 +1159,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);
-- 
cgit v1.2.3