X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=b47ead02b30ed0fb8831152a1de6bbbba2b57318;hb=3fd74abb3c2969f170d727154245cde3ef8a4b87;hp=3f79f621f10882017bcd92276e1b9e197bb273bd;hpb=63f748aa3fac4d3ed004a2c5343a51c3a046e21d;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 3f79f621..b47ead02 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -55,7 +55,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 (focus_valid_target(c, d->desktop,
-                               TRUE, TRUE, FALSE, FALSE, FALSE, FALSE)) {
+                               TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE)) {
             ObMenuEntry *e;
 
             empty = FALSE;
@@ -69,7 +69,7 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
                 e = menu_add_normal(menu, d->desktop, c->title, NULL, FALSE);
             }
 
-            if (config_menu_client_list_icons) {
+            if (config_menu_show_icons) {
                 e->data.normal.icon = client_icon(c);
                 RrImageRef(e->data.normal.icon);
                 e->data.normal.icon_alpha = c->iconic ? OB_ICONIC_ALPHA : 0xff;
@@ -116,7 +116,7 @@ static void desk_menu_destroy(ObMenu *menu, gpointer data)
 {
     DesktopData *d = data;
 
-    g_free(d);
+    g_slice_free(DesktopData, d);
 
     desktop_menus = g_slist_remove(desktop_menus, menu);
 }
@@ -136,7 +136,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
     for (i = 0; i < screen_num_desktops; ++i) {
         ObMenu *submenu;
         gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
-        DesktopData *ddata = g_new(DesktopData, 1);
+        DesktopData *ddata = g_slice_new(DesktopData);
 
         ddata->desktop = i;
         submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata);