remove an unused variable

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index d703babdf334621d3e0308a964fa7a8b14e6c19e..1351339988b991a5e2341835780c97f40efb86d6 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -49,9 +49,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
     menu_clear_entries(menu);
 
-    for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
+    for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
         ObClient *c = it->data;
-        if (client_normal(c) && (!c->skip_taskbar || c->iconic)) {
+        if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
+            (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
+        {
             GSList *acts = NULL;
             ObAction* act;
             ObMenuEntry *e;
@@ -61,7 +63,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
             if (!icons && c->iconic) {
                 icons = TRUE;
-                menu_add_separator(menu, -1);
+                menu_add_separator(menu, -1, NULL);
             }
 
             act = action_from_string("Activate",
@@ -74,7 +76,6 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             acts = g_slist_append(acts, act);
             e = menu_add_normal(menu, i,
                                 (c->iconic ? c->icon_title : c->title), acts);
-
             if (config_menu_client_list_icons
                 && (icon = client_icon(c, 32, 32))) {
                 e->data.normal.icon_width = icon->width;