aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-30 21:10:19 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-30 21:10:19 +0800
commit6d1261917c33f372f254ed84c3c6956c1e90fbc5 (patch)
tree30aec7e77c0a647ac83fc19015b0a5f4a4850d06
parent5a39893c82e21a54b6156054f45f8db9c5a9802c (diff)
downloadgsoc2013-empathy-6d1261917c33f372f254ed84c3c6956c1e90fbc5.tar
gsoc2013-empathy-6d1261917c33f372f254ed84c3c6956c1e90fbc5.tar.gz
gsoc2013-empathy-6d1261917c33f372f254ed84c3c6956c1e90fbc5.tar.bz2
gsoc2013-empathy-6d1261917c33f372f254ed84c3c6956c1e90fbc5.tar.lz
gsoc2013-empathy-6d1261917c33f372f254ed84c3c6956c1e90fbc5.tar.xz
gsoc2013-empathy-6d1261917c33f372f254ed84c3c6956c1e90fbc5.tar.zst
gsoc2013-empathy-6d1261917c33f372f254ed84c3c6956c1e90fbc5.zip
Stop calling gtk_menu_detach()
GTK+ does it for us now: http://git.gnome.org/browse/gtk+/commit/?id=6716e7c3f1925560a5b4901581cabbaee4e01e28
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c4
-rw-r--r--libempathy-gtk/empathy-individual-view.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index f7a946a71..1b11309f3 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -816,8 +816,6 @@ contact_list_view_popup_menu_idle_cb (gpointer user_data)
}
if (menu) {
- g_signal_connect (menu, "deactivate",
- G_CALLBACK (gtk_menu_detach), NULL);
gtk_menu_attach_to_widget (GTK_MENU (menu),
GTK_WIDGET (data->view), NULL);
gtk_widget_show (menu);
@@ -936,8 +934,6 @@ contact_list_view_call_activated_cb (
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
- g_signal_connect (menu, "deactivate",
- G_CALLBACK (gtk_menu_detach), NULL);
gtk_menu_attach_to_widget (GTK_MENU (menu),
GTK_WIDGET (view), NULL);
gtk_widget_show (menu);
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 0f4abe9ac..39dc3b34b 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -900,7 +900,6 @@ individual_view_popup_menu_idle_cb (gpointer user_data)
if (menu != NULL)
{
- g_signal_connect (menu, "deactivate", G_CALLBACK (gtk_menu_detach), NULL);
gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (data->view),
NULL);
gtk_widget_show (menu);
@@ -1032,7 +1031,6 @@ individual_view_call_activated_cb (EmpathyCellRendererActivatable *cell,
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
- g_signal_connect (menu, "deactivate", G_CALLBACK (gtk_menu_detach), NULL);
gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (view), NULL);
gtk_widget_show (menu);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,