summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-06 18:09:32 +0100
committerinfirit <[email protected]>2014-11-07 10:54:26 +0100
commite8b2d2156a6f530812d9958b3675e2402e44ecab (patch)
tree18d6c0b646a71da4b4b1ac8d85ddd903e5993121 /src/core
parente2f29ace20f74e1e62e80ba13d8d6bbe36d65212 (diff)
downloadmarco-e8b2d2156a6f530812d9958b3675e2402e44ecab.tar.bz2
marco-e8b2d2156a6f530812d9958b3675e2402e44ecab.tar.xz
Revert "Possible keybinding to switch to previous workspace."
This reverts commit 69b7a0ad9277f21ad761c84ac1bae5455a2f879e. It has the unintended side-effect that it reverses the alt+tab behaviour.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/keybindings.c8
-rw-r--r--src/core/screen-private.h3
-rw-r--r--src/core/workspace.c3
-rw-r--r--src/core/workspace.h3
4 files changed, 1 insertions, 16 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 8176b96f..eea49baf 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2252,14 +2252,6 @@ handle_switch_to_workspace (MetaDisplay *display,
{
gint which = binding->handler->data;
MetaWorkspace *workspace;
-
- if (which == META_MOTION_PREV)
- {
- workspace = screen->prev_workspace;
- if (workspace)
- meta_workspace_activate (workspace, event->xkey.time);
- return;
- }
if (which < 0)
{
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index 6784cc9b..0103c6ad 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -85,9 +85,6 @@ struct _MetaScreen
MetaWorkspace *active_workspace;
- /* Previous active workspace */
- MetaWorkspace *prev_workspace;
-
/* This window holds the focus when we don't want to focus
* any actual clients
*/
diff --git a/src/core/workspace.c b/src/core/workspace.c
index eb2db05a..b85ab53c 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -385,9 +385,6 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
/* Note that old can be NULL; e.g. when starting up */
old = workspace->screen->active_workspace;
- /* Save old workspace, to be able to switch back. */
- workspace->screen->prev_workspace = old;
-
workspace->screen->active_workspace = workspace;
set_active_space_hint (workspace->screen);
diff --git a/src/core/workspace.h b/src/core/workspace.h
index 4b52f96e..40942e1a 100644
--- a/src/core/workspace.h
+++ b/src/core/workspace.h
@@ -43,8 +43,7 @@ typedef enum
META_MOTION_UP = -1,
META_MOTION_DOWN = -2,
META_MOTION_LEFT = -3,
- META_MOTION_RIGHT = -4,
- META_MOTION_PREV = -5
+ META_MOTION_RIGHT = -4
} MetaMotionDirection;
struct _MetaWorkspace