Merge lp:~mterry/appmenu-gtk/watch-menubar-parents into lp:appmenu-gtk/0.4

[Michael Terry]

This watches menubars for reparenting, so that if they get swapped in and out, like they do for shotwell, we notice and rebuild.

Some notes:
 * I also got rid of a couple of variables (append and after_startup) that weren't used

 * I guarded the connect for toplevel_notify_cb so it only gets connected if toplevel isn't a window and only once (not a big deal, since when run, it disconnects all other connected instances, but cleanliness is next to something or other)

 * I didn't bother handling the case of a menubar disappearing and not immediately being replaced by another. In this hopefully-rare case, we'd need to be able to find the old window context (so we'd need to save a pointer to the old parented toplevel) and set its root to NULL.

[Ted Gould (ted)]

review: Approve

=== modified file 'src/bridge.c'
--- src/bridge.c	2011-03-07 22:05:29 +0000
+++ src/bridge.c	2011-03-09 16:02:46 +0000
@@ -52,7 +52,10 @@
 static void     mnemonic_shown_cb          (GtkWidget         *widget,
                                             GParamSpec        *pspec,
                                             AppWindowContext  *context);
-static void     toplevel_notify_cb         (GtkWidget         *widget,
+static void     toplevel_notify_parent_cb  (GtkWidget         *widget,
+                                            GParamSpec        *pspec,
+                                            UbuntuMenuProxy   *proxy);
+static void     menubar_notify_parent_cb   (GtkWidget         *widget,
                                             GParamSpec        *pspec,
                                             UbuntuMenuProxy   *proxy);
 static void     rebuild_window_items       (AppMenuBridge     *bridge,
@@ -99,7 +102,6 @@
 static GHashTable *rebuild_ids = NULL;
 static GDBusNodeInfo *      registrar_node_info = NULL;
 static GDBusInterfaceInfo * registrar_interface_info = NULL;
-static gboolean after_startup = FALSE;
 
 static void
 activate_menu (AppMenuBridge *bridge,
@@ -624,8 +626,8 @@
   if (!GTK_IS_WINDOW (toplevel))
     {
       g_signal_connect (G_OBJECT (toplevel),
-                        "notify",
-                        G_CALLBACK (toplevel_notify_cb),
+                        "notify::parent",
+                        G_CALLBACK (toplevel_notify_parent_cb),
                         bridge);
 
       return;
@@ -750,33 +752,42 @@
 }
 
 static void
-toplevel_notify_cb (GtkWidget       *widget,
-                    GParamSpec      *pspec,
-                    UbuntuMenuProxy *proxy)
-{
-  if (pspec->name == g_intern_static_string ("parent"))
-    {
-      GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
-      AppMenuBridge *bridge = APP_MENU_BRIDGE (proxy);
-
-      if (gtk_widget_get_parent (widget) == NULL)
-        return;
-
-      if (GTK_IS_WINDOW (toplevel))
-        {
-          g_signal_handlers_disconnect_by_func (widget,
-                                                G_CALLBACK (toplevel_notify_cb),
-                                                proxy);
-          rebuild (bridge, toplevel);
-        }
-      else
-        {
-          g_signal_connect (G_OBJECT (toplevel),
-                            "notify",
-                            G_CALLBACK (toplevel_notify_cb),
-                            proxy);
-        }
-    }
+toplevel_notify_parent_cb (GtkWidget       *widget,
+                           GParamSpec      *pspec,
+                           UbuntuMenuProxy *proxy)
+{
+  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+  AppMenuBridge *bridge = APP_MENU_BRIDGE (proxy);
+
+  if (gtk_widget_get_parent (widget) == NULL)
+    return;
+
+  if (GTK_IS_WINDOW (toplevel))
+    {
+      g_signal_handlers_disconnect_by_func (widget,
+                                            G_CALLBACK (toplevel_notify_parent_cb),
+                                            proxy);
+      rebuild (bridge, toplevel);
+    }
+  else
+    {
+      g_signal_connect (G_OBJECT (toplevel),
+                        "notify::parent",
+                        G_CALLBACK (toplevel_notify_parent_cb),
+                        proxy);
+    }
+}
+
+static void
+menubar_notify_parent_cb (GtkWidget       *widget,
+                          GParamSpec      *pspec,
+                          UbuntuMenuProxy *proxy)
+{
+  if (gtk_widget_get_parent (widget) == NULL)
+    return; /* TODO: Should clear all entries (find old context and set root to NULL) */
+
+  /* Rebuild now or when toplevel window appears */
+  toplevel_notify_parent_cb (widget, NULL, proxy);
 }
 
 static void
@@ -794,14 +805,6 @@
     }
 }
 
-gboolean
-startup_timeout (gpointer data)
-{
-  after_startup = TRUE;
-
-  return FALSE;
-}
-
 static void
 app_menu_bridge_insert (UbuntuMenuProxy *proxy,
                         GtkWidget       *parent,
@@ -811,9 +814,6 @@
   AppMenuBridge        *bridge;
   AppMenuBridgePrivate *priv;
   GtkWidget            *toplevel = NULL;
-  gboolean              append = FALSE;
-
-  g_idle_add ((GSourceFunc)startup_timeout, NULL);
 
   if (GTK_IS_TEAROFF_MENU_ITEM (child))
     return;
@@ -825,12 +825,26 @@
 
   if (GTK_IS_MENU_BAR (parent))
     {
-      g_signal_connect (G_OBJECT (toplevel),
-                        "notify",
-                        G_CALLBACK (toplevel_notify_cb),
-                        proxy);
+      /* Watch for toplevel window to appear */
+      if (!GTK_IS_WINDOW (toplevel) &&
+          g_signal_handler_find (toplevel, G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
+                                 toplevel_notify_parent_cb, NULL) == 0)
+        {
+          g_signal_connect (toplevel,
+                            "notify::parent",
+                            G_CALLBACK (toplevel_notify_parent_cb),
+                            proxy);
+        }
 
-      append = TRUE;
+      /* Watch for parent changes for the menubar itself */
+      if (g_signal_handler_find (parent, G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
+                                 menubar_notify_parent_cb, NULL) == 0)
+        {
+          g_signal_connect (parent,
+                            "notify::parent",
+                            G_CALLBACK (menubar_notify_parent_cb),
+                            proxy);
+        }
     }
   else if (GTK_IS_MENU (parent))
     {