[empathy] disconnect the activate cb before detaching the menu

[Guillaume Desmottes <gdesmott src gnome org>]

commit a44c73c2e1a57ce59a7eba6d547da2f76ecda430
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Feb 16 15:49:04 2011 +0100

    disconnect the activate cb before detaching the menu

 libempathy-gtk/empathy-contact-list-view.c |    4 ++--
 libempathy-gtk/empathy-individual-view.c   |    4 ++--
 libempathy-gtk/empathy-ui-utils.c          |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 8d234e3..3a3ac54 100644
--- 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 96ff466..7bc05b7 100644
--- 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 1016c72..ee9ae76 100644
--- 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