X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_combined_menu.c;h=3c6d8c6ce0b23fb16ac6e27bba680def9efa505a;hb=5a3a7668d9e3ebe995603fadd2da22cbe1c31c83;hp=f590dc10a992e9e4981df5e77df27b6637f6050d;hpb=bf247215bb015dbb4dfa39c38bf020aa815cd306;p=chaz%2Fopenbox

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index f590dc10..3c6d8c6c 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -48,27 +48,18 @@ static void self_update(ObMenuFrame *frame, gpointer data)
         gboolean empty = TRUE;
 
         /* Don't need a separator at the very top */
-        if (desktop > 0)
-            menu_add_separator(menu, -1);
-        e = menu_add_normal(menu, -1, NULL, NULL);
-        e->data.normal.enabled = FALSE;
-        e->data.normal.label = g_strdup(screen_desktop_names[desktop]);
-        /* The one at the bottom will always have entries below it though */
-        menu_add_separator(menu, -1);
-        for (it = focus_order[desktop], i = 0; it; it = g_list_next(it), ++i) {
+        menu_add_separator(menu, -1, screen_desktop_names[desktop]);
+        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 == desktop || c->desktop == DESKTOP_ALL))
+            {
                 GSList *acts = NULL;
                 ObAction* act;
                 const ObClientIcon *icon;
 
                 empty = FALSE;
 
-                if (!icons && c->iconic) {
-                    icons = TRUE;
-                    menu_add_separator(menu, -1);
-                }
-
                 act = action_from_string("Activate",
                                          OB_USER_ACTION_MENU_SELECTION);
                 act->data.activate.any.c = c;
@@ -77,8 +68,13 @@ static void self_update(ObMenuFrame *frame, gpointer data)
                                          OB_USER_ACTION_MENU_SELECTION);
                 act->data.desktop.desk = desktop;
                 acts = g_slist_append(acts, act);
-                e = menu_add_normal(menu, i, (c->iconic ?
-                                              c->icon_title : c->title), acts);
+
+                if (c->iconic) {
+                    gchar *title = g_strdup_printf("(%s)", c->icon_title);
+                    e = menu_add_normal(menu, i, title, acts);
+                    g_free(title);
+                } else
+                    e = menu_add_normal(menu, i, c->title, acts);
 
                 if (config_menu_client_list_icons
                         && (icon = client_icon(c, 32, 32))) {