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

[Michael Terry]

=== modified file 'src/bridge.c'
--- src/bridge.c	2011-02-27 16:41:13 +0000
+++ src/bridge.c	2011-03-02 20:22:54 +0000
@@ -214,10 +214,6 @@
                                        G_CALLBACK(toplevel_unmapped),
                                        user_data);
 
-  g_signal_connect(widget, "map",
-                   G_CALLBACK (toplevel_mapped),
-                   context->bridge);
-
   if (context)
     {
       free_context_contents (context);
@@ -548,6 +544,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),
@@ -648,10 +653,6 @@
 {
   AppMenuBridge *bridge = APP_MENU_BRIDGE (user_data);
 
-  g_signal_handlers_disconnect_by_func(widget,
-                                       G_CALLBACK(toplevel_mapped),
-                                       user_data);
-
   if (GTK_IS_WINDOW (widget))
     {
       rebuild (bridge, widget);