From 9e17747f3cb0d059fe96adf894532ea0ecdd1de2 Mon Sep 17 00:00:00 2001 From: Thomas Thurman Date: Mon, 20 Feb 2006 02:15:14 +0000 Subject: [PATCH] Removed "move to another workspace" menu when there are exactly two 2006-02-19 Thomas Thurman Removed "move to another workspace" menu when there are exactly two workspaces. Fixes #151183. * src/menu.c (meta_window_menu_new): clear META_MENU_OP_WORKSPACES bit when n_workspaces==2 --- ChangeLog | 8 ++++++++ src/menu.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3d6903b78..450b77789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-02-19 Thomas Thurman + + Removed "move to another workspace" menu when there are + exactly two workspaces. Fixes #151183. + + * src/menu.c (meta_window_menu_new): clear + META_MENU_OP_WORKSPACES bit when n_workspaces==2 + Fri Feb 17 11:56:35 2006 Søren Sandmann * src/screen.c (meta_screen_free): Only uncomposite the screen if diff --git a/src/menu.c b/src/menu.c index 65f37508b..2f78152d3 100644 --- a/src/menu.c +++ b/src/menu.c @@ -267,6 +267,9 @@ meta_window_menu_new (MetaFrames *frames, if (n_workspaces < 2) ops &= ~(META_MENU_OP_STICK | META_MENU_OP_UNSTICK | META_MENU_OP_WORKSPACES); + else if (n_workspaces == 2) + /* #151183: If we only have two workspaces, disable the menu listing them. */ + ops &= ~(META_MENU_OP_WORKSPACES); menu = g_new (MetaWindowMenu, 1); menu->frames = frames;