X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=a1dc266c5066d1b713d8a3c68ade1cfe96d5a816;hb=3fb94dfc5f07635116cf7af124a8e5651323840b;hp=985cb729267e1fac1b0825ef246cb89ead415048;hpb=7833271d1461d9b0e02ffc804cd4e0156fd8faf4;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 985cb729..a1dc266c 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -49,7 +49,7 @@ 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)) {
+        if (client_normal(c) && !c->skip_taskbar) {
             GSList *acts = NULL;
             ObAction* act;
             ObMenuEntry *e;
@@ -86,10 +86,14 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
         GSList *acts = NULL;
         ObAction* act;
+        ObMenuEntry *e;
+
         act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
         act->data.desktop.desk = d->desktop;
         acts = g_slist_append(acts, act);
-        menu_add_normal(menu, 0, _("Go there..."), acts);
+        e = menu_add_normal(menu, 0, _("Go there..."), acts);
+        if (d->desktop == screen_desktop)
+            e->data.normal.enabled = FALSE;
     }
 }