diff options
| author | Elijah Newren <newren@gmail.com> | 2005-01-28 16:36:14 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2005-01-28 16:36:14 +0000 |
| commit | 7d0ef20a9c2a223d6296bfbcd7f53ca4e9def0ef (patch) | |
| tree | 0992faad30b344f27da914980bb2b14ce7e0f785 /src | |
| parent | cabf4fc359d8c2b9b3357a1bf7f10eeb1c7cac2d (diff) | |
| download | mutter-7d0ef20a9c2a223d6296bfbcd7f53ca4e9def0ef.tar.gz | |
Change wording of menu to "Always on Current Workspace" from "Put on All
2005-01-28 Elijah Newren <newren@gmail.com>
* src/menu.c: Change wording of menu to "Always on Current
Workspace" from "Put on All Workspaces", remove a quick-key
conflict between "On _Top" and "Only on _This Workspace" by
switching the latter to "_Only on This Workspace"
* src/window.c: Remove a comment that is no longer necessary
(since bug 87531 has been fixed)
Diffstat (limited to 'src')
| -rw-r--r-- | src/menu.c | 4 | ||||
| -rw-r--r-- | src/window.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/menu.c b/src/menu.c index d96936e2d..61cc1d436 100644 --- a/src/menu.c +++ b/src/menu.c @@ -63,8 +63,8 @@ static MenuItem menuitems[] = { { 0, NULL, FALSE, NULL }, /* separator */ { META_MENU_OP_DELETE, METACITY_STOCK_DELETE, FALSE, N_("_Close") }, { META_MENU_OP_WORKSPACES, NULL, FALSE, NULL }, /* separator */ - { META_MENU_OP_STICK, NULL, FALSE, N_("Put on _All Workspaces") }, - { META_MENU_OP_UNSTICK, NULL, FALSE, N_("Only on _This Workspace") }, + { META_MENU_OP_STICK, NULL, FALSE, N_("_Always on Current Workspace") }, + { META_MENU_OP_UNSTICK, NULL, FALSE, N_("_Only on This Workspace") }, { META_MENU_OP_MOVE_LEFT, NULL, FALSE, N_("Move to Workspace _Left") }, { META_MENU_OP_MOVE_RIGHT, NULL, FALSE, N_("Move to Workspace R_ight") }, { META_MENU_OP_MOVE_UP, NULL, FALSE, N_("Move to Workspace _Up") }, diff --git a/src/window.c b/src/window.c index fb40f66e6..dd8922b4a 100644 --- a/src/window.c +++ b/src/window.c @@ -1215,9 +1215,6 @@ meta_window_showing_on_its_workspace (MetaWindow *window) &is_desktop_or_dock); if (window->on_all_workspaces) - /* Until the behavior in bug 87531 is implemented, this will be - * just a hack that only sort of works. - */ workspace_of_window = window->screen->active_workspace; else if (window->workspace) workspace_of_window = window->workspace; |