X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=openbox%2Fclient_list_menu.c;h=2ac2903869b01b98e72f0149763448fe321d183b;hb=de98f8153b087316bc15a5d4ddd645c6972aad69;hp=ca9156ddf4e76440ffdc37aef385ce2f7a50f2d9;hpb=4f3cffb84756caff4538e595b803793bcb300dac;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index ca9156dd..2ac29038 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -49,11 +49,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
     for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
         ObClient *c = it->data;
-        if (client_normal(c)) {
-            GSList *acts;
+        if (client_normal(c) && !c->skip_taskbar) {
+            GSList *acts = NULL;
             ObAction* act;
             ObMenuEntry *e;
-            ObClientIcon *icon;
+            const ObClientIcon *icon;
 
             empty = FALSE;
 
@@ -65,7 +65,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             act = action_from_string("Activate",
                                      OB_USER_ACTION_MENU_SELECTION);
             act->data.activate.any.c = c;
-            acts = g_slist_prepend(NULL, act);
+            acts = g_slist_append(acts, act);
+            act = action_from_string("Desktop",
+                                     OB_USER_ACTION_MENU_SELECTION);
+            act->data.desktop.desk = d->desktop;
+            acts = g_slist_append(acts, act);
             e = menu_add_normal(menu, i,
                                 (c->iconic ? c->icon_title : c->title), acts);
 
@@ -80,12 +84,12 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
     if (empty) {
         /* no entries */
 
-        GSList *acts;
+        GSList *acts = NULL;
         ObAction* act;
         act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
         act->data.desktop.desk = d->desktop;
-        acts = g_slist_prepend(NULL, act);
-        menu_add_normal(menu, 0, "Activate...", acts);
+        acts = g_slist_append(acts, act);
+        menu_add_normal(menu, 0, _("Go there..."), acts);
     }
 }