From e8b2d2156a6f530812d9958b3675e2402e44ecab Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Thu, 6 Nov 2014 18:09:32 +0100
Subject: 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.
---
 src/50-marco-global-key.xml.in | 7 -------
 src/core/keybindings.c         | 8 --------
 src/core/screen-private.h      | 3 ---
 src/core/workspace.c           | 3 ---
 src/core/workspace.h           | 3 +--
 src/include/all-keybindings.h  | 3 ---
 src/org.mate.marco.gschema.xml | 5 -----
 7 files changed, 1 insertion(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in
index ddbacf18..81a8db85 100644
--- a/src/50-marco-global-key.xml.in
+++ b/src/50-marco-global-key.xml.in
@@ -127,12 +127,5 @@
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
-	<KeyListEntry name="switch-to-workspace-prev"
-	_description="Switch to previously selected workspace"
-	value="1"
-	key="num-workspaces"
-	schema="org.mate.Marco.general"
-	comparison="gt" />
-
 </KeyListEntries>
 
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
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
index 6707a212..5b030280 100644
--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
@@ -111,9 +111,6 @@ keybind (switch-to-workspace-up, handle_switch_to_workspace,
 keybind (switch-to-workspace-down, handle_switch_to_workspace,
          META_MOTION_DOWN, 0)
 
-keybind (switch-to-workspace-prev, handle_switch_to_workspace,
-         META_MOTION_PREV, 0)
-
 /***********************************/
 
 /* The ones which have inverses.  These can't be bound to any keystroke
diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
index 5a1bef84..a0725382 100644
--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
@@ -497,11 +497,6 @@
       <summary>Switch to workspace below the current workspace</summary>
       <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
     </key>
-    <key name="switch-to-workspace-prev" type="s">
-      <default>'disabled'</default>
-      <summary>Switch to previously selected workspace</summary>
-      <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
-    </key>
     <key name="switch-group" type="s">
       <default>'disabled'</default>
       <summary>Move between windows of an application, using a popup window</summary>
-- 
cgit v1.2.1