Merge branch 'master' into chaz

[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 f4aae884eb3139892efb49570a09eeb203290ff3..c26b6fa036f3da35c874d068c07b67e50ee13b07 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -37,6 +37,11 @@ static ObMenu *combined_menu;
 #define ADD_DESKTOP -2
 #define REMOVE_DESKTOP -3
 
+static void self_cleanup(ObMenu *menu, gpointer data)
+{
+    menu_clear_entries(menu);
+}
+
 static gboolean self_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
@@ -54,7 +59,8 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         for (it = focus_order; it; it = g_list_next(it)) {
             ObClient *c = it->data;
             if (focus_valid_target(c, desktop,
-                                   TRUE, TRUE, FALSE, FALSE, FALSE, FALSE))
+                                   TRUE, TRUE,
+                                   FALSE, TRUE, FALSE, FALSE, FALSE))
             {
                 empty = FALSE;
 
@@ -150,6 +156,7 @@ void client_list_combined_menu_startup(gboolean reconfig)
 
     combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL);
     menu_set_update_func(combined_menu, self_update);
+    menu_set_cleanup_func(combined_menu, self_cleanup);
     menu_set_execute_func(combined_menu, menu_execute);
 }