X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_combined_menu.c;h=a04d07d6fd5295ae2ac0615c65e7e518804bb8be;hb=c38a756ae50616b1431e3137141189a5588654a0;hp=bb4921909fea315665d051937cc5c51e4a08c846;hpb=2c50fae3479172c869b59f9128edc9a6eef69946;p=chaz%2Fopenbox

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index bb492190..a04d07d6 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -22,6 +22,7 @@
 #include "menuframe.h"
 #include "screen.h"
 #include "client.h"
+#include "client_list_combined_menu.h"
 #include "focus.h"
 #include "config.h"
 #include "gettext.h"
@@ -30,7 +31,7 @@
 
 #define MENU_NAME "client-list-combined-menu"
 
-ObMenu *combined_menu;
+static ObMenu *combined_menu;
 
 #define SEPARATOR -1
 #define ADD_DESKTOP -2
@@ -55,8 +56,6 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
             if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
                 (c->desktop == desktop || c->desktop == DESKTOP_ALL))
             {
-                const ObClientIcon *icon;
-
                 empty = FALSE;
 
                 if (c->iconic) {
@@ -68,11 +67,9 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
                     e = menu_add_normal(menu, desktop, c->title, NULL, FALSE);
                 }
 
-                if (config_menu_client_list_icons
-                        && (icon = client_icon(c, 32, 32))) {
-                    e->data.normal.icon_width = icon->width;
-                    e->data.normal.icon_height = icon->height;
-                    e->data.normal.icon_data = icon->data;
+                if (config_menu_client_list_icons) {
+                    e->data.normal.icon = client_icon(c);
+                    RrImageRef(e->data.normal.icon);
                     e->data.normal.icon_alpha =
                         c->iconic ? OB_ICONIC_ALPHA : 0xff;
                 }
@@ -82,8 +79,6 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         }
 
         if (empty || onlyiconic) {
-            ObMenuEntry *e;
-
             /* no entries or only iconified windows, so add a
              * way to go to this desktop without uniconifying a window */
             if (!empty)
@@ -95,10 +90,12 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         }
     }
 
-    menu_add_separator(menu, SEPARATOR, _("Manage desktops"));
-    menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE);
-    menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"),
-                    NULL, TRUE);
+    if (config_menu_manage_desktops) {
+        menu_add_separator(menu, SEPARATOR, _("Manage desktops"));
+        menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE);
+        menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"),
+                        NULL, TRUE);
+    }
 
     return TRUE; /* always show the menu */
 }