disconnect the activate cb before detaching the menu

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 8d234e375da2b7baf9e3ae175be292a8a2feeca3..3a3ac54545bad4e317b638ec10c616bf01c06396 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -807,11 +807,11 @@ static void
 menu_deactivate_cb (GtkMenuShell *menushell,
                    gpointer user_data)
 {
-       gtk_menu_detach (GTK_MENU (menushell));
-
        /* FIXME: we shouldn't have to disconnec the signal (bgo #641327) */
        g_signal_handlers_disconnect_by_func (menushell,
                menu_deactivate_cb, user_data);
+
+       gtk_menu_detach (GTK_MENU (menushell));
 }
 
 static gboolean

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 96ff466d260ab61fd66866ef1649e60097a64885..7bc05b785ef5ed98749fa953635e10f0f4cbdc97 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -888,11 +888,11 @@ static void
 menu_deactivate_cb (GtkMenuShell *menushell,
     gpointer user_data)
 {
-  gtk_menu_detach (GTK_MENU (menushell));
-
   /* FIXME: we shouldn't have to disconnec the signal (bgo #641327) */
   g_signal_handlers_disconnect_by_func (menushell,
       menu_deactivate_cb, user_data);
+
+  gtk_menu_detach (GTK_MENU (menushell));
 }
 
 static gboolean

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 1016c729ccc5ca47ff9b2180ff31f3060374c02f..ee9ae763bb7f4641ef74c3d3363c284e3268121a 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1912,11 +1912,11 @@ static void
 menu_deactivate_cb (GtkMenu *menu,
        gpointer user_data)
 {
-       gtk_menu_detach (menu);
-
        /* FIXME: we shouldn't have to disconnect the signal (bgo #641327) */
        g_signal_handlers_disconnect_by_func (menu,
                     menu_deactivate_cb, user_data);
+
+       gtk_menu_detach (menu);
 }
 
 /* Convenient function to create a GtkMenu attached to @attach_to and detach