diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2011-11-04 18:14:26 +0100 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2011-11-11 20:27:37 +0100 |
| commit | a228546d3cdf3364b82d76b374fb08aae202ab87 (patch) | |
| tree | 8bf43deab9299e230e59ce9f295f4e87351d5680 /src/core/workspace.c | |
| parent | 65f4590467b893aec99e2e008781c9979e10a068 (diff) | |
| download | metacity-a228546d3cdf3364b82d76b374fb08aae202ab87.tar.gz | |
Port preferences to GSettings
Move preferences to GSettings, using mainly shared schemas from
gsettings-desktop-schemas.
Unlike GConf, GSettings support is not optional, as Gio is already
a hard dependency of GTK+.
Based on an initial patch from Milan Bouchet-Valat.
https://bugzilla.gnome.org/show_bug.cgi?id=621204
Diffstat (limited to 'src/core/workspace.c')
| -rw-r--r-- | src/core/workspace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/workspace.c b/src/core/workspace.c index 12798a55..e877b195 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -888,7 +888,7 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace, } - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK || + if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK || !workspace->screen->display->mouse_mode) focus_ancestor_or_mru_window (workspace, not_this_one, timestamp); else @@ -926,9 +926,9 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace, window); } } - else if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_SLOPPY) + else if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_SLOPPY) focus_ancestor_or_mru_window (workspace, not_this_one, timestamp); - else if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_MOUSE) + else if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_MOUSE) { meta_topic (META_DEBUG_FOCUS, "Setting focus to no_focus_window, since no valid " @@ -984,7 +984,7 @@ focus_ancestor_or_mru_window (MetaWorkspace *workspace, meta_window_focus (ancestor, timestamp); /* Also raise the window if in click-to-focus */ - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK) + if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK) meta_window_raise (ancestor); return; @@ -1030,7 +1030,7 @@ focus_ancestor_or_mru_window (MetaWorkspace *workspace, meta_window_focus (window, timestamp); /* Also raise the window if in click-to-focus */ - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK) + if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK) meta_window_raise (window); } else |