Merge lp:~bratsche/indicator-application/menu-changes into lp:indicator-application/0.4

[Cody Russell]

[Cody Russell (bratsche)]

This branch fixes issues where menuitems' visibility isn't reflected remotely on the app indicator.

It also watches for additions or removals of menuitems to the GtkMenu, and when those happen it causes the dbusmenu to rebuild itself.

[Ted Gould (ted)]

Approve.

review: Approve

=== modified file 'example/simple-client.c'
--- example/simple-client.c	2010-02-12 01:54:18 +0000
+++ example/simple-client.c	2010-02-12 21:45:28 +0000
@@ -57,7 +57,6 @@
 {
   GtkWidget *target = (GtkWidget *)data;
 
-  gtk_menu_item_set_label (GTK_MENU_ITEM (target), "modified!!");
   gtk_widget_set_sensitive (target, !GTK_WIDGET_IS_SENSITIVE (target));
 }
 
@@ -73,6 +72,7 @@
 {
   GtkWidget *menu;
   GtkWidget *mi;
+  GtkWidget *prev_mi;
 
   menu = gtk_menu_new ();
 
@@ -81,10 +81,11 @@
   g_signal_connect (mi, "activate",
                     G_CALLBACK (item_clicked_cb), "Sub 1");
 
+  prev_mi = mi;
   mi = gtk_menu_item_new_with_label ("Sub 2");
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
   g_signal_connect (mi, "activate",
-                    G_CALLBACK (item_clicked_cb), "Sub 2");
+                    G_CALLBACK (toggle_sensitivity_cb), prev_mi);
 
   mi = gtk_menu_item_new_with_label ("Sub 3");
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);

=== modified file 'src/libappindicator/app-indicator.c'
--- src/libappindicator/app-indicator.c	2010-02-12 21:23:20 +0000
+++ src/libappindicator/app-indicator.c	2010-02-12 21:45:28 +0000
@@ -447,23 +447,23 @@
 
         switch (prop_id) {
         case PROP_ID:
-			if (priv->id != NULL) {
-				g_warning ("Resetting ID value when I already had a value of: %s", priv->id);
-				break;
-			}
-
-			priv->id = g_strdup (g_value_get_string (value));
-
-			priv->clean_id = g_strdup(priv->id);
-			gchar * cleaner;
-			for (cleaner = priv->clean_id; *cleaner != '\0'; cleaner++) {
-				if (!g_ascii_isalnum(*cleaner)) {
-					*cleaner = '_';
-				}
-			}
-
-			check_connect (self);
-			break;
+          if (priv->id != NULL) {
+            g_warning ("Resetting ID value when I already had a value of: %s", priv->id);
+            break;
+          }
+
+          priv->id = g_strdup (g_value_get_string (value));
+
+          priv->clean_id = g_strdup(priv->id);
+          gchar * cleaner;
+          for (cleaner = priv->clean_id; *cleaner != '\0'; cleaner++) {
+            if (!g_ascii_isalnum(*cleaner)) {
+              *cleaner = '_';
+            }
+          }
+
+          check_connect (self);
+          break;
 
         case PROP_CATEGORY:
           enum_val = g_enum_get_value_by_nick ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY),
@@ -506,11 +506,11 @@
         break;
 
         case PROP_ICON_THEME_PATH:
-			if (priv->icon_path != NULL) {
-				g_free(priv->icon_path);
-			}
-			priv->icon_path = g_value_dup_string(value);
-			break;
+          if (priv->icon_path != NULL) {
+            g_free(priv->icon_path);
+          }
+          priv->icon_path = g_value_dup_string(value);
+          break;
 
         default:
           G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -556,14 +556,14 @@
           break;
 
         case PROP_MENU:
-			if (priv->menuservice != NULL) {
-				GValue strval = {0};
-				g_value_init(&strval, G_TYPE_STRING);
-				g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval);
-				g_value_set_boxed(value, g_value_get_string(&strval));
-				g_value_unset(&strval);
-			}
-			break;
+          if (priv->menuservice != NULL) {
+            GValue strval = { 0 };
+            g_value_init(&strval, G_TYPE_STRING);
+            g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval);
+            g_value_set_boxed(value, g_value_get_string(&strval));
+            g_value_unset(&strval);
+          }
+          break;
 
         case PROP_CONNECTED:
           g_value_set_boolean (value, priv->watcher_proxy != NULL ? TRUE : FALSE);
@@ -1128,6 +1128,12 @@
                                       DBUSMENU_MENUITEM_PROP_LABEL,
                                       gtk_menu_item_get_label (GTK_MENU_ITEM (widget)));
     }
+  else if (pspec->name == g_intern_static_string ("visible"))
+    {
+      dbusmenu_menuitem_property_set_bool (child,
+                                           DBUSMENU_MENUITEM_PROP_VISIBLE,
+                                           gtk_widget_get_visible (widget));
+    }
 }
 
 static void
@@ -1262,14 +1268,22 @@
   return;
 }
 
+static void
+client_menu_changed (GtkWidget    *widget,
+                     GtkWidget    *child,
+                     AppIndicator *indicator)
+{
+  setup_dbusmenu (indicator);
+}
+
 /**
         app_indicator_set_menu:
         @self: The #AppIndicator
         @menu: A #GtkMenu to set
 
-		Sets the menu that should be shown when the Application Indicator
-		is clicked on in the panel.  An application indicator will not
-		be rendered unless it has a menu.
+        Sets the menu that should be shown when the Application Indicator
+        is clicked on in the panel.  An application indicator will not
+        be rendered unless it has a menu.
 **/
 void
 app_indicator_set_menu (AppIndicator *self, GtkMenu *menu)
@@ -1293,6 +1307,15 @@
   setup_dbusmenu (self);
 
   check_connect (self);
+
+  g_signal_connect (menu,
+                    "add",
+                    G_CALLBACK (client_menu_changed),
+                    self);
+  g_signal_connect (menu,
+                    "remove",
+                    G_CALLBACK (client_menu_changed),
+                    self);
 }
 
 /**