]> git.0d.be Git - empathy.git/commitdiff
Stop calling gtk_menu_detach()
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 30 Nov 2010 13:10:19 +0000 (14:10 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 30 Nov 2010 13:10:19 +0000 (14:10 +0100)
GTK+ does it for us now:
http://git.gnome.org/browse/gtk+/commit/?id=6716e7c3f1925560a5b4901581cabbaee4e01e28

libempathy-gtk/empathy-contact-list-view.c
libempathy-gtk/empathy-individual-view.c

index f7a946a7147b50f7e306c33ce723a35c5882a1f1..1b11309f3f150efd8047dab08b48afd3479ec152 100644 (file)
@@ -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);
index 0f4abe9ac5c6d2c5324ea7ffb93e2f02db9b4c86..39dc3b34b98c2b3fc1325ed6bc74662bb8bce30f 100644 (file)
@@ -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,