[Xfce4-commits] <xfdesktop:master> Do not call gtk_widget_show() on menus (bug #6198).

[Nick Schermer]

Updating branch refs/heads/master
         to 84996fa52bc4536d32914dc4cce6ef2fbef608d2 (commit)
       from 839f1cffc25a81659556cc078ff2086106fc569e (commit)

commit 84996fa52bc4536d32914dc4cce6ef2fbef608d2
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Nov 27 09:59:42 2010 +0100

    Do not call gtk_widget_show() on menus (bug #6198).

 src/menu.c                        |    1 -
 src/windowlist.c                  |    2 --
 src/xfce-desktop-menu.c           |    1 -
 src/xfce-desktop.c                |    1 -
 src/xfdesktop-file-icon-manager.c |    2 --
 5 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/menu.c b/src/menu.c
index 2e35f30..6e67394 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -109,7 +109,6 @@ menu_populate(XfceDesktop *desktop,
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
             
             gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), desktop_menu_widget);
-            gtk_widget_show(desktop_menu_widget);
         }
     } else {
         /* just get the menu as a list of toplevel GtkMenuItems instead of
diff --git a/src/windowlist.c b/src/windowlist.c
index 0f8dbb5..3692615 100644
--- a/src/windowlist.c
+++ b/src/windowlist.c
@@ -227,7 +227,6 @@ windowlist_populate(XfceDesktop *desktop,
     if(menu_children) {
         GtkWidget *tmpmenu = gtk_menu_new();
         gtk_menu_set_screen(GTK_MENU(tmpmenu), gscreen);
-        gtk_widget_show(tmpmenu);
         
         mi = gtk_separator_menu_item_new();
         gtk_widget_show(mi);
@@ -296,7 +295,6 @@ windowlist_populate(XfceDesktop *desktop,
             
             if(wl_submenus) {
                 submenu = gtk_menu_new();
-                gtk_widget_show(submenu);
                 gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), submenu);
             } else {
                 mi = gtk_separator_menu_item_new();
diff --git a/src/xfce-desktop-menu.c b/src/xfce-desktop-menu.c
index cc5b7fc..f0615ef 100644
--- a/src/xfce-desktop-menu.c
+++ b/src/xfce-desktop-menu.c
@@ -135,7 +135,6 @@ desktop_menu_add_items(XfceDesktopMenu *desktop_menu,
             icon_name = NULL;
 
             submenu = gtk_menu_new();
-            gtk_widget_show(submenu);
 
             if(garcon_directory) {
                 if(desktop_menu->use_menu_icons)
diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index 424e4ea..0dab00d 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -1327,7 +1327,6 @@ xfce_desktop_do_menu_popup(XfceDesktop *desktop,
     
     menu = gtk_menu_new();
     gtk_menu_set_screen(GTK_MENU(menu), screen);
-    gtk_widget_show(menu);
     g_signal_connect_swapped(G_OBJECT(menu), "deactivate",
                              G_CALLBACK(g_idle_add),
                              (gpointer)xfce_desktop_menu_destroy_idled);
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index c271118..2685e32 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -1440,7 +1440,6 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
                     gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
                     
                     tmpl_menu = gtk_menu_new();
-                    gtk_widget_show(tmpl_menu);
                     gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), tmpl_menu);
                     
                     home_dir = g_file_new_for_path(xfce_get_homedir());
@@ -1538,7 +1537,6 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
                             gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
                             
                             app_infos_menu = gtk_menu_new();
-                            gtk_widget_show(app_infos_menu);
                             gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi),
                                                       app_infos_menu);
                         } else