[mutter] Remove application-based preference
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Remove application-based preference
- Date: Thu, 18 Jul 2013 01:04:06 +0000 (UTC)
commit 1c569c2d0e651215d2a468fd80a449588a4743ca
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jul 17 21:03:47 2013 -0400
Remove application-based preference
It's hardcoded to FALSE.
doc/reference/meta-sections.txt | 1 -
src/core/display.c | 19 +------------------
src/core/prefs.c | 19 -------------------
src/meta/prefs.h | 3 ---
4 files changed, 1 insertions(+), 41 deletions(-)
---
diff --git a/doc/reference/meta-sections.txt b/doc/reference/meta-sections.txt
index 73935ac..de67466 100644
--- a/doc/reference/meta-sections.txt
+++ b/doc/reference/meta-sections.txt
@@ -409,7 +409,6 @@ meta_prefs_get_theme
meta_prefs_get_titlebar_font
meta_prefs_get_num_workspaces
meta_prefs_get_dynamic_workspaces
-meta_prefs_get_application_based
meta_prefs_get_disable_workarounds
meta_prefs_get_auto_raise
meta_prefs_get_auto_raise_delay
diff --git a/src/core/display.c b/src/core/display.c
index bdb74be..e78085c 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2494,30 +2494,13 @@ event_callback (XEvent *event,
/* This is from our synchronous grab since
* it has no modifiers and was on the client window
*/
- int mode;
-
- /* When clicking a different app in click-to-focus
- * in application-based mode, and the different
- * app is not a dock or desktop, eat the focus click.
- */
- if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
- meta_prefs_get_application_based () &&
- !window->has_focus &&
- window->type != META_WINDOW_DOCK &&
- window->type != META_WINDOW_DESKTOP &&
- (display->focus_window == NULL ||
- !meta_window_same_application (window,
- display->focus_window)))
- mode = XIAsyncDevice; /* eat focus click */
- else
- mode = XIReplayDevice; /* give event back */
meta_verbose ("Allowing events mode %s time %u\n",
mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
(unsigned int)device_event->time);
XIAllowEvents (display->xdisplay, device_event->deviceid,
- mode, device_event->time);
+ XIReplayDevice, device_event->time);
}
if (begin_move && window->has_move_func)
diff --git a/src/core/prefs.c b/src/core/prefs.c
index b096d45..f2bc7f2 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -89,7 +89,6 @@ static GDesktopTitlebarAction action_double_click_titlebar = G_DESKTOP_TITLEBAR_
static GDesktopTitlebarAction action_middle_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_LOWER;
static GDesktopTitlebarAction action_right_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_MENU;
static gboolean dynamic_workspaces = FALSE;
-static gboolean application_based = FALSE;
static gboolean disable_workarounds = FALSE;
static gboolean auto_raise = FALSE;
static gboolean auto_raise_delay = 500;
@@ -299,13 +298,6 @@ static MetaBoolPreference preferences_bool[] =
&dynamic_workspaces,
},
{
- { "application-based",
- SCHEMA_GENERAL,
- META_PREF_APPLICATION_BASED,
- },
- NULL, /* feature is known but disabled */
- },
- {
{ "disable-workarounds",
SCHEMA_GENERAL,
META_PREF_DISABLE_WORKAROUNDS,
@@ -1724,14 +1716,6 @@ meta_prefs_get_dynamic_workspaces (void)
}
gboolean
-meta_prefs_get_application_based (void)
-{
- return FALSE; /* For now, we never want this to do anything */
-
- return application_based;
-}
-
-gboolean
meta_prefs_get_disable_workarounds (void)
{
return disable_workarounds;
@@ -1768,9 +1752,6 @@ meta_preference_to_string (MetaPreference pref)
case META_PREF_NUM_WORKSPACES:
return "NUM_WORKSPACES";
- case META_PREF_APPLICATION_BASED:
- return "APPLICATION_BASED";
-
case META_PREF_KEYBINDINGS:
return "KEYBINDINGS";
diff --git a/src/meta/prefs.h b/src/meta/prefs.h
index 274312e..969ff40 100644
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -49,7 +49,6 @@
* @META_PREF_TITLEBAR_FONT: title-bar font
* @META_PREF_NUM_WORKSPACES: number of workspaces
* @META_PREF_DYNAMIC_WORKSPACES: dynamic workspaces
- * @META_PREF_APPLICATION_BASED: application-based
* @META_PREF_KEYBINDINGS: keybindings
* @META_PREF_DISABLE_WORKAROUNDS: disable workarounds
* @META_PREF_BUTTON_LAYOUT: button layout
@@ -88,7 +87,6 @@ typedef enum
META_PREF_TITLEBAR_FONT,
META_PREF_NUM_WORKSPACES,
META_PREF_DYNAMIC_WORKSPACES,
- META_PREF_APPLICATION_BASED,
META_PREF_KEYBINDINGS,
META_PREF_DISABLE_WORKAROUNDS,
META_PREF_BUTTON_LAYOUT,
@@ -136,7 +134,6 @@ const char* meta_prefs_get_theme (void);
const PangoFontDescription* meta_prefs_get_titlebar_font (void);
int meta_prefs_get_num_workspaces (void);
gboolean meta_prefs_get_dynamic_workspaces (void);
-gboolean meta_prefs_get_application_based (void);
gboolean meta_prefs_get_disable_workarounds (void);
gboolean meta_prefs_get_auto_raise (void);
int meta_prefs_get_auto_raise_delay (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]