[Xfce4-commits] <xfdesktop:master> Fix window actions on minimised windows' icons (bug #7225).

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to f992724e69142c0450a39b5d513723750d08f62d (commit)
       from 489def8303e97b98876c6c08b8094f6556df444c (commit)

commit f992724e69142c0450a39b5d513723750d08f62d
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Apr 17 19:43:25 2011 +0200

    Fix window actions on minimised windows' icons (bug #7225).

 src/xfdesktop-window-icon.c |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/xfdesktop-window-icon.c b/src/xfdesktop-window-icon.c
index 853d331..b04fdeb 100644
--- a/src/xfdesktop-window-icon.c
+++ b/src/xfdesktop-window-icon.c
@@ -203,23 +203,13 @@ xfdesktop_window_icon_populate_context_menu(XfdesktopIcon *icon,
 {
     XfdesktopWindowIcon *window_icon = XFDESKTOP_WINDOW_ICON(icon);
     GtkWidget *amenu = wnck_create_window_action_menu(window_icon->priv->window);
-    GList *items, *l;
-    
-    /* this is unfortunately slightly retarded */
-    items = gtk_container_get_children(GTK_CONTAINER(amenu));
-    for(l = items; l; l = l->next) {
-        GtkWidget *mi = l->data;
-        g_object_ref(G_OBJECT(mi));
-        gtk_container_remove(GTK_CONTAINER(amenu), mi);
-        gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
-        g_object_unref(G_OBJECT(mi));
-    }
-    g_list_free(items);
-    gtk_widget_destroy(amenu);
-    
-    if(!items)
-        return FALSE;
-    
+    GtkWidget *mi;
+
+    mi = gtk_menu_item_new_with_mnemonic("_Window Actions");
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM(mi), amenu);
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+    gtk_widget_show_all(mi);
+
     return TRUE;
 }