diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-07 02:06:42 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-07 02:06:42 -0500 |
| commit | 5f04ca85ef6a2ebc2d66842e261a676691e9b4de (patch) | |
| tree | 5d28851a47a36a7130426644573f0fe1b1a6b5e8 /openbox/client_list_combined_menu.c | |
| parent | 4435c3a438f092252f563d5fd97dffd440a164db (diff) | |
| parent | 307befd333dd89a990e541c37c8c3717e125dcdf (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
Diffstat (limited to 'openbox/client_list_combined_menu.c')
| -rw-r--r-- | openbox/client_list_combined_menu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c index c1572eaf..76a819fc 100644 --- a/openbox/client_list_combined_menu.c +++ b/openbox/client_list_combined_menu.c @@ -94,10 +94,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 */ } |