diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-02-16 22:49:04 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-02-16 22:49:04 +0800 |
| commit | a44c73c2e1a57ce59a7eba6d547da2f76ecda430 (patch) | |
| tree | df2330d156cfc3afeb8a65abd38d3af261686c82 | |
| parent | 89c2a14e5eba2921b4ee6264f2a218eb3d93717f (diff) | |
| download | gsoc2013-empathy-a44c73c2e1a57ce59a7eba6d547da2f76ecda430.tar gsoc2013-empathy-a44c73c2e1a57ce59a7eba6d547da2f76ecda430.tar.gz gsoc2013-empathy-a44c73c2e1a57ce59a7eba6d547da2f76ecda430.tar.bz2 gsoc2013-empathy-a44c73c2e1a57ce59a7eba6d547da2f76ecda430.tar.lz gsoc2013-empathy-a44c73c2e1a57ce59a7eba6d547da2f76ecda430.tar.xz gsoc2013-empathy-a44c73c2e1a57ce59a7eba6d547da2f76ecda430.tar.zst gsoc2013-empathy-a44c73c2e1a57ce59a7eba6d547da2f76ecda430.zip | |
disconnect the activate cb before detaching the menu
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 4 | ||||
| -rw-r--r-- | 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 8d234e375..3a3ac5454 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 96ff466d2..7bc05b785 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 1016c729c..ee9ae763b 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 |