From: Dana Jansens <danakj@orodu.net>
Date: Thu, 26 Apr 2007 05:39:39 +0000 (+0000)
Subject: merge r5944 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~212
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7733a68cab75ddf3c308350e4bb7532b69e24d92;p=dana%2Fopenbox.git

merge r5944 from trunk
---

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 208b31c1..6dc7881e 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -44,7 +44,6 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
     DesktopData *d = data;
     GList *it;
     gint i;
-    gboolean icons = FALSE;
     gboolean empty = TRUE;
 
     menu_clear_entries(menu);
@@ -61,11 +60,6 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
             empty = FALSE;
 
-            if (!icons && c->iconic) {
-                icons = TRUE;
-                menu_add_separator(menu, -1, NULL);
-            }
-
             act = action_from_string("Activate",
                                      OB_USER_ACTION_MENU_SELECTION);
             act->data.activate.any.c = c;
@@ -74,9 +68,13 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
                                      OB_USER_ACTION_MENU_SELECTION);
             act->data.desktop.desk = d->desktop;
             acts = g_slist_append(acts, act);
-            e = menu_add_normal(menu, i,
-                                (c->iconic ? c->icon_title : c->title),
-                                acts, FALSE);
+
+            if (c->iconic) {
+                gchar *title = g_strdup_printf("(%s)", c->icon_title);
+                e = menu_add_normal(menu, i, title, acts, FALSE);
+                g_free(title);
+            } else
+                e = menu_add_normal(menu, i, c->title, acts, FALSE);
 
             if (config_menu_client_list_icons
                 && (icon = client_icon(c, 32, 32))) {