Add an option <manageDesktop> to disable the Manage Desktop section in client-list...

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index a7aa4158baaee280dfdfbe61522dd73f37556bd1..cc17f920d65d6a035a5144e342b43a01ef02d3a4 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -98,10 +98,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_desktop) {
+        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 */
 }

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 3dbc605910256a7f01016d64f52d6e5345ee4947..24594b9007ac36ec87cc24fdd34d861e68fad91a 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -155,10 +155,12 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         desktop_menus = g_slist_append(desktop_menus, submenu);
     }
 
-    menu_add_separator(menu, SEPARATOR, NULL);
-    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_desktop) {
+        menu_add_separator(menu, SEPARATOR, NULL);
+        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 */
 }

diff --git a/openbox/config.c b/openbox/config.c
index ddc6be5c8771d60410ca71430c733aacf8defd57..c09e56f35dd5f5ffe9314a8a6c6b7c86f7ebf5bb 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -89,6 +89,7 @@ guint    config_menu_hide_delay;
 gboolean config_menu_middle;
 guint    config_submenu_show_delay;
 gboolean config_menu_client_list_icons;
+gboolean config_menu_manage_desktop;
 
 GSList *config_menu_files;
 
@@ -772,6 +773,8 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_submenu_show_delay = parse_int(doc, n);
         if ((n = parse_find_node("applicationIcons", node)))
             config_menu_client_list_icons = parse_bool(doc, n);
+        if ((n = parse_find_node("manageDesktop", node)))
+            config_menu_manage_desktop = parse_bool(doc, n);
     }
 }
 
@@ -962,6 +965,7 @@ void config_startup(ObParseInst *i)
     config_menu_middle = FALSE;
     config_submenu_show_delay = 0;
     config_menu_client_list_icons = TRUE;
+    config_menu_manage_desktop = TRUE;
     config_menu_files = NULL;
 
     parse_register(i, "menu", parse_menu, NULL);

diff --git a/openbox/config.h b/openbox/config.h
index 0a3eda1228b16007b38d0eae277f035681216951..ece2e91d5ad0c462a8f68650f18f6a3578c25460 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -177,6 +177,8 @@ extern gboolean config_menu_middle;
 extern guint    config_submenu_show_delay;
 /*! show icons in client_list_menu */
 extern gboolean config_menu_client_list_icons;
+/*! show manage desktop in client_list_menu */
+extern gboolean config_menu_manage_desktop;
 /*! User-specified menu files */
 extern GSList *config_menu_files;
 /*! Per app settings */