use the valid_focus_target() method for choosing what to show in the client list menus

2 files changed, 2 insertions, 5 deletions

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 5b79b806..7f0e9f5d 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -53,8 +53,7 @@ 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 (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
-                (c->desktop == desktop || c->desktop == DESKTOP_ALL))
+            if (focus_valid_target(c, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE))
             {
                 empty = FALSE;
 
diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index c49e63e9..e1f4987a 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -54,9 +54,7 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
 
     for (it = focus_order; it; it = g_list_next(it)) {
         ObClient *c = it->data;
-        if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
-            (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
-        {
+        if (focus_valid_target(c, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE)) {
             ObMenuEntry *e;
 
             empty = FALSE;