1 files changed, 99 insertions, 16 deletions

diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 7560a97..3b15472 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -740,6 +740,87 @@ menuitem_iterate (GtkWidget *widget,
 }
 
 static void
+update_icon_name (DbusmenuMenuitem *menuitem,
+                  GtkImage         *image)
+{
+  if (gtk_image_get_storage_type (image) != GTK_IMAGE_ICON_NAME)
+    return;
+
+  dbusmenu_menuitem_property_set (menuitem,
+                                  DBUSMENU_MENUITEM_PROP_ICON,
+                                  image->data.name.icon_name);
+}
+
+/* return value specifies whether the label is set or not */
+static gboolean
+update_stock_item (DbusmenuMenuitem *menuitem,
+                   GtkImage         *image)
+{
+  GtkStockItem stock;
+
+  if (gtk_image_get_storage_type (image) != GTK_IMAGE_STOCK)
+    return FALSE;
+
+  gtk_stock_lookup (image->data.stock.stock_id, &stock);
+
+  g_print ("set stock id `%s'\n", image->data.stock.stock_id);
+
+  dbusmenu_menuitem_property_set (menuitem,
+                                  DBUSMENU_MENUITEM_PROP_ICON,
+                                  image->data.stock.stock_id);
+
+  if (stock.label != NULL)
+    {
+      dbusmenu_menuitem_property_set (menuitem,
+                                      DBUSMENU_MENUITEM_PROP_LABEL,
+                                      stock.label);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+image_notify_cb (GtkWidget  *widget,
+                 GParamSpec *pspec,
+                 gpointer    data)
+{
+  DbusmenuMenuitem *child = (DbusmenuMenuitem *)data;
+  GtkImage *image = GTK_IMAGE (widget);
+
+  if (pspec->name == g_intern_static_string ("stock"))
+    {
+      update_stock_item (child, image);
+    }
+  else if (pspec->name == g_intern_static_string ("icon-name"))
+    {
+      update_icon_name (child, image);
+    }
+}
+
+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)
 {
@@ -786,25 +867,24 @@ container_iterate (GtkWidget *widget,
         }
       else if (GTK_IS_IMAGE_MENU_ITEM (widget))
         {
-          GtkWidget *image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (widget));
-
-          if (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_STOCK)
-            {
-              GtkStockItem stock;
+          GtkWidget *image;
+          GtkImageType image_type;
 
-              gtk_stock_lookup (GTK_IMAGE (image)->data.stock.stock_id, &stock);
+          image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (widget));
+          image_type = gtk_image_get_storage_type (GTK_IMAGE (image));
 
-              dbusmenu_menuitem_property_set (child,
-                                              DBUSMENU_MENUITEM_PROP_ICON,
-                                              GTK_IMAGE (image)->data.stock.stock_id);
+          g_signal_connect (image,
+                            "notify",
+                            G_CALLBACK (image_notify_cb),
+                            child);
 
-              if (stock.label != NULL)
-                {
-                  dbusmenu_menuitem_property_set (child,
-                                                  DBUSMENU_MENUITEM_PROP_LABEL,
-                                                  stock.label);
-                  label_set = TRUE;
-                }
+          if (image_type == GTK_IMAGE_STOCK)
+            {
+              label_set = update_stock_item (child, GTK_IMAGE (image));
+            }
+          else if (image_type == GTK_IMAGE_ICON_NAME)
+            {
+              update_icon_name (child, GTK_IMAGE (image));
             }
         }
     }
@@ -826,6 +906,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);