Merge lp:~chrisccoulson/appmenu-gtk/lp718926 into lp:appmenu-gtk/0.4

[Chris Coulson]

Attach to map/unmap signals on toplevel windows, rather than realized/destroyed. This ensures we restore menus for applications which have minimize-to-tray functionality (eg, empathy).

This aligns appmenu-gtk with indicator-appmenu, which destroys menus when a toplevel-window is closed (ie, when an application unmaps its window)

[Michael Terry (mterry)]

Looks reasonable to me.

review: Approve

[Michael Terry (mterry)]

Hrm, this causes bug 727843. Looking into it.

[Ted Gould (ted)]

Marking as "Work in Progress" while mterry investigates.

[Michael Terry (mterry)]

See https://code.launchpad.net/~mterry/appmenu-gtk/lp718926/+merge/51951

[lp:~chrisccoulson/appmenu-gtk/lp718926]

120. By Chris Coulson on 2011-03-03

Merge from lp:~mterry/appmenu-gtk/lp718926

[Ted Gould (ted)]

Approving with mterry's fix.

review: Approve

=== modified file 'src/bridge.c'
--- src/bridge.c	2011-03-02 18:25:44 +0000
+++ src/bridge.c	2011-03-03 16:04:11 +0000
@@ -47,7 +47,7 @@
                                             GtkWidget         *child,
                                             guint              position);
 static gboolean app_menu_bridge_show_local (UbuntuMenuProxy   *proxy);
-static void     toplevel_realized          (GtkWidget         *widget,
+static void     toplevel_mapped            (GtkWidget         *widget,
                                             gpointer           user_data);
 static void     mnemonic_shown_cb          (GtkWidget         *widget,
                                             GParamSpec        *pspec,
@@ -214,11 +214,15 @@
 }
 
 static void
-toplevel_destroyed (GtkWidget *widget,
-                    gpointer   user_data)
+toplevel_unmapped (GtkWidget *widget,
+                   gpointer   user_data)
 {
   AppWindowContext *context = (AppWindowContext *)user_data;
 
+  g_signal_handlers_disconnect_by_func(widget,
+                                       G_CALLBACK(toplevel_unmapped),
+                                       user_data);
+
   if (context)
     {
       free_context_contents (context);
@@ -577,6 +581,15 @@
   XID xid;
   AppWindowContext *context = NULL;
 
+  /* Disconnect any "map" signal and reconnect, which guarantees that there is
+     at least one and at most one listener */
+  g_signal_handlers_disconnect_by_func(toplevel,
+                                       G_CALLBACK(toplevel_mapped),
+                                       bridge);
+  g_signal_connect (toplevel, "map",
+                    G_CALLBACK (toplevel_mapped),
+                    bridge);
+
   if (!GTK_IS_WINDOW (toplevel))
     {
       g_signal_connect (G_OBJECT (toplevel),
@@ -602,12 +615,8 @@
         }
     }
 
-  if (!gtk_widget_get_realized (toplevel))
+  if (!gtk_widget_get_mapped (toplevel))
     {
-      g_signal_connect (toplevel, "realize",
-                        G_CALLBACK (toplevel_realized),
-                        bridge);
-
       return;
     }
 
@@ -645,7 +654,7 @@
       if (context->window != toplevel)
         {
           g_signal_handlers_disconnect_by_func (context->window,
-                                                G_CALLBACK (toplevel_destroyed),
+                                                G_CALLBACK (toplevel_unmapped),
                                                 context);
         }
     }
@@ -661,8 +670,8 @@
 
       g_object_add_weak_pointer(G_OBJECT(context->window), (gpointer *)&(context->window));
       g_signal_connect (toplevel,
-                        "destroy",
-                        G_CALLBACK (toplevel_destroyed),
+                        "unmap",
+                        G_CALLBACK (toplevel_unmapped),
                         context);
     }
 
@@ -695,8 +704,8 @@
 }
 
 static void
-toplevel_realized (GtkWidget *widget,
-                   gpointer   user_data)
+toplevel_mapped (GtkWidget *widget,
+                 gpointer   user_data)
 {
   AppMenuBridge *bridge = APP_MENU_BRIDGE (user_data);
 
@@ -835,14 +844,14 @@
 
   if (GTK_IS_WINDOW (toplevel))
     {
-      if (gtk_widget_get_realized (toplevel))
+      if (gtk_widget_get_mapped (toplevel))
         {
           rebuild (bridge, toplevel);
         }
       else
         {
-          g_signal_connect (toplevel, "realize",
-                            G_CALLBACK (toplevel_realized),
+          g_signal_connect (toplevel, "map",
+                            G_CALLBACK (toplevel_mapped),
                             bridge);
         }
     }