Merge branch 'backport' into work

[chaz/openbox] / openbox / client_list_combined_menu.c

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 7f0e9f5ddb3c8924a694bee4ac23ecdcf7321271..f4aae884eb3139892efb49570a09eeb203290ff3 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -53,7 +53,8 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         menu_add_separator(menu, SEPARATOR, screen_desktop_names[desktop]);
         for (it = focus_order; it; it = g_list_next(it)) {
             ObClient *c = it->data;
-            if (focus_valid_target(c, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE))
+            if (focus_valid_target(c, desktop,
+                                   TRUE, TRUE, FALSE, FALSE, FALSE, FALSE))
             {
                 empty = FALSE;
 
@@ -66,7 +67,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
                     e = menu_add_normal(menu, desktop, c->title, NULL, FALSE);
                 }
 
-                if (config_menu_client_list_icons) {
+                if (config_menu_show_icons) {
                     e->data.normal.icon = client_icon(c);
                     RrImageRef(e->data.normal.icon);
                     e->data.normal.icon_alpha =