diff --git a/src/core/prefs.c b/src/core/prefs.c
index 93c198786..3f3050dfc 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -53,7 +53,6 @@
#define KEY_GNOME_CURSOR_SIZE "cursor-size"
#define KEY_OVERLAY_KEY "overlay-key"
-#define KEY_LIVE_HIDDEN_WINDOWS "live-hidden-windows"
#define KEY_WORKSPACES_ONLY_ON_PRIMARY "workspaces-only-on-primary"
#define KEY_NO_TAB_POPUP "no-tab-popup"
@@ -104,7 +103,6 @@ static MetaButtonLayout button_layout;
/* NULL-terminated array */
static char **workspace_names = NULL;
-static gboolean live_hidden_windows = FALSE;
static gboolean workspaces_only_on_primary = FALSE;
static gboolean no_tab_popup = FALSE;
@@ -345,13 +343,6 @@ static MetaBoolPreference preferences_bool[] =
},
&edge_tiling,
},
- {
- { KEY_LIVE_HIDDEN_WINDOWS,
- SCHEMA_MUTTER,
- META_PREF_LIVE_HIDDEN_WINDOWS,
- },
- &live_hidden_windows,
- },
{
{ "workspaces-only-on-primary",
SCHEMA_MUTTER,
@@ -1613,9 +1604,6 @@ meta_preference_to_string (MetaPreference pref)
case META_PREF_FORCE_FULLSCREEN:
return "FORCE_FULLSCREEN";
- case META_PREF_LIVE_HIDDEN_WINDOWS:
- return "LIVE_HIDDEN_WINDOWS";
-
case META_PREF_WORKSPACES_ONLY_ON_PRIMARY:
return "WORKSPACES_ONLY_ON_PRIMARY";
@@ -2127,27 +2115,6 @@ meta_prefs_get_force_fullscreen (void)
return force_fullscreen;
}
-gboolean
-meta_prefs_get_live_hidden_windows (void)
-{
-#if 0
- return live_hidden_windows;
-#else
- return TRUE;
-#endif
-}
-
-void
-meta_prefs_set_live_hidden_windows (gboolean whether)
-{
- MetaBasePreference *pref;
-
- find_pref (preferences_bool, sizeof(MetaBoolPreference),
- KEY_LIVE_HIDDEN_WINDOWS, &pref);
- g_settings_set_boolean (SETTINGS (pref->schema), KEY_LIVE_HIDDEN_WINDOWS,
- whether);
-}
-
gboolean
meta_prefs_get_workspaces_only_on_primary (void)
{
diff --git a/src/core/window.c b/src/core/window.c
index b3a5633ec..5a7ac628e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2225,7 +2225,7 @@ implement_showing (MetaWindow *window,
* so we should place the window even if we're hiding it rather
* than showing it.
*/
- if (!window->placed && meta_prefs_get_live_hidden_windows ())
+ if (!window->placed)
meta_window_force_placement (window);
meta_window_hide (window);
@@ -3108,15 +3108,12 @@ meta_window_show (MetaWindow *window)
if (map_client_window (window))
did_show = TRUE;
- if (meta_prefs_get_live_hidden_windows ())
+ if (window->hidden)
{
- if (window->hidden)
- {
- meta_stack_freeze (window->screen->stack);
- window->hidden = FALSE;
- meta_stack_thaw (window->screen->stack);
- did_show = TRUE;
- }
+ meta_stack_freeze (window->screen->stack);
+ window->hidden = FALSE;
+ meta_stack_thaw (window->screen->stack);
+ did_show = TRUE;
}
if (window->iconic)
@@ -3251,32 +3248,19 @@ meta_window_hide (MetaWindow *window)
did_hide = FALSE;
- if (meta_prefs_get_live_hidden_windows ())
- {
- /* If this is the first time that we've calculating the showing
- * state of the window, the frame and client window might not
- * yet be mapped, so we need to map them now */
- map_frame (window);
- map_client_window (window);
+ /* If this is the first time that we've calculating the showing
+ * state of the window, the frame and client window might not
+ * yet be mapped, so we need to map them now */
+ map_frame (window);
+ map_client_window (window);
- if (!window->hidden)
- {
- meta_stack_freeze (window->screen->stack);
- window->hidden = TRUE;
- meta_stack_thaw (window->screen->stack);
-
- did_hide = TRUE;
- }
- }
- else
+ if (!window->hidden)
{
- /* Unmapping the frame is enough to make the window disappear,
- * but we need to hide the window itself so the client knows
- * it has been hidden */
- if (unmap_frame (window))
- did_hide = TRUE;
- if (unmap_client_window (window, " (hiding)"))
- did_hide = TRUE;
+ meta_stack_freeze (window->screen->stack);
+ window->hidden = TRUE;
+ meta_stack_thaw (window->screen->stack);
+
+ did_hide = TRUE;
}
if (!window->iconic)
@@ -5827,7 +5811,7 @@ update_net_frame_extents (MetaWindow *window)
meta_topic (META_DEBUG_GEOMETRY,
"Setting _NET_FRAME_EXTENTS on managed window 0x%lx "
- "to left = %lu, right = %lu, top = %lu, bottom = %lu\n",
+ "to left = %lu, right = %lu, top = %lu, bottom = %lu\n",
window->xwindow, data[0], data[1], data[2], data[3]);
meta_error_trap_push (window->display);
@@ -8243,10 +8227,6 @@ menu_callback (MetaWindowMenu *menu,
{
meta_window_change_workspace (window,
workspace);
-#if 0
- meta_workspace_activate (workspace);
- meta_window_raise (window);
-#endif
}
}
else
@@ -8336,13 +8316,6 @@ meta_window_show_menu (MetaWindow *window,
else
ops |= META_MENU_OP_MAXIMIZE;
-#if 0
- if (window->shaded)
- ops |= META_MENU_OP_UNSHADE;
- else
- ops |= META_MENU_OP_SHADE;
-#endif
-
if (window->wm_state_above)
ops |= META_MENU_OP_UNABOVE;
else
diff --git a/src/meta/prefs.h b/src/meta/prefs.h
index df17647dd..f2ccf3957 100644
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -64,7 +64,6 @@ typedef enum
META_PREF_RESIZE_WITH_RIGHT_BUTTON,
META_PREF_EDGE_TILING,
META_PREF_FORCE_FULLSCREEN,
- META_PREF_LIVE_HIDDEN_WINDOWS,
META_PREF_WORKSPACES_ONLY_ON_PRIMARY,
META_PREF_NO_TAB_POPUP,
META_PREF_DRAGGABLE_BORDER_WIDTH
@@ -139,9 +138,6 @@ void meta_prefs_set_compositing_manager (gboolean whether);
void meta_prefs_set_force_fullscreen (gboolean whether);
-gboolean meta_prefs_get_live_hidden_windows (void);
-void meta_prefs_set_live_hidden_windows (gboolean whether);
-
gboolean meta_prefs_get_workspaces_only_on_primary (void);
gboolean meta_prefs_get_no_tab_popup (void);
diff --git a/src/org.gnome.mutter.gschema.xml.in b/src/org.gnome.mutter.gschema.xml.in
index 465feabec..e23ad8175 100644
--- a/src/org.gnome.mutter.gschema.xml.in
+++ b/src/org.gnome.mutter.gschema.xml.in
@@ -25,16 +25,6 @@
-
- false
- <_summary>Live Hidden Windows
- <_description>
- Determines whether hidden windows (i.e., minimized windows and
- windows on other workspaces than the current one) should be kept
- alive.
-
-
-
false
<_summary>Enable edge tiling when dropping windows on screen edges