1) get rid of menu titles

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index f49f623b7f6cc0b87ad32038a77f777cf8f03aad..66b2b1d7996496d82c58e3d44c0f2f5c283849b9 100644 (file)
--- 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);
-            }
-
             act = action_from_string("Activate",
                                      OB_USER_ACTION_MENU_SELECTION);
             act->data.activate.any.c = c;
@@ -74,8 +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);
+
+            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))) {