diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml
index 4b98f5aa..252eda0f 100644
--- a/data/gala.gschema.xml
+++ b/data/gala.gschema.xml
@@ -7,11 +7,10 @@
-
-
-
-
-
+
+
+
+
@@ -148,8 +147,8 @@
Zoom out
- w']]]>
- Shortcut to open the window overview
+
+ DEPRECATED: This key is deprecated and ignored
diff --git a/lib/ActivatableComponent.vala b/lib/ActivatableComponent.vala
index a0d7dd2f..40231b74 100644
--- a/lib/ActivatableComponent.vala
+++ b/lib/ActivatableComponent.vala
@@ -27,8 +27,7 @@ namespace Gala {
* The component was requested to be opened.
*
* @param hints The hashmap may contain special parameters that are useful
- * to the component. Currently, the only one implemented is the
- * 'all-windows' hint to the windowoverview.
+ * to the component.
*/
public abstract void open (HashTable? hints = null);
diff --git a/src/Widgets/WindowOverview.vala b/src/Widgets/WindowOverview.vala
index f1807785..627b1454 100644
--- a/src/Widgets/WindowOverview.vala
+++ b/src/Widgets/WindowOverview.vala
@@ -67,19 +67,12 @@ public class Gala.WindowOverview : Clutter.Actor, ActivatableComponent {
/**
* {@inheritDoc}
- * You may specify 'all-windows' in hints to expose all windows
*/
public void open (HashTable? hints = null) {
- var all_windows = hints != null && "all-windows" in hints;
-
workspaces = new List ();
unowned var manager = wm.get_display ().get_workspace_manager ();
- if (all_windows) {
- foreach (unowned var workspace in manager.get_workspaces ()) {
- workspaces.append (workspace);
- }
- } else {
- workspaces.append (manager.get_active_workspace ());
+ foreach (unowned var workspace in manager.get_workspaces ()) {
+ workspaces.append (workspace);
}
var windows = new List ();
@@ -172,7 +165,6 @@ public class Gala.WindowOverview : Clutter.Actor, ActivatableComponent {
}
switch (binding.get_name ()) {
- case "expose-windows":
case "expose-all-windows":
case "zoom-in":
case "zoom-out":
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
index 1ae7cf30..ef04073e 100644
--- a/src/WindowManager.vala
+++ b/src/WindowManager.vala
@@ -357,20 +357,11 @@ namespace Gala {
ui_group.add_child (screen_shield);
- display.add_keybinding ("expose-windows", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, () => {
- if (window_overview.is_opened ()) {
- window_overview.close ();
- } else {
- window_overview.open ();
- }
- });
display.add_keybinding ("expose-all-windows", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, () => {
if (window_overview.is_opened ()) {
window_overview.close ();
} else {
- var hints = new HashTable (str_hash, str_equal);
- hints.@set ("all-windows", true);
- window_overview.open (hints);
+ window_overview.open ();
}
});
@@ -982,24 +973,26 @@ namespace Gala {
}
break;
case ActionType.WINDOW_OVERVIEW:
- if (window_overview == null)
+ if (window_overview == null) {
break;
+ }
- if (window_overview.is_opened ())
+ if (window_overview.is_opened ()) {
window_overview.close ();
- else
+ } else {
window_overview.open ();
+ }
+ critical ("Window overview is deprecated");
break;
case ActionType.WINDOW_OVERVIEW_ALL:
- if (window_overview == null)
+ if (window_overview == null) {
break;
+ }
- if (window_overview.is_opened ())
+ if (window_overview.is_opened ()) {
window_overview.close ();
- else {
- var hints = new HashTable (str_hash, str_equal);
- hints.@set ("all-windows", true);
- window_overview.open (hints);
+ } else {
+ window_overview.open ();
}
break;
case ActionType.SWITCH_TO_WORKSPACE_LAST: