From 91844e48e947826d5d71b2ca5d5edf335620ea26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 6 Jun 2013 16:40:02 +0200 Subject: [PATCH] main: Pick up overridesSchema from sessionMode This will allow the use of mode-specific defaults. For classic mode we currently implement this with mini-extensions, but this may result in confusing behavior when settings change due to extensions being disabled during screen locks (not to mention that those mini-extensions are hardly an elegant approach). https://bugzilla.gnome.org/show_bug.cgi?id=701717 --- js/ui/main.js | 5 ++--- js/ui/sessionMode.js | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/ui/main.js b/js/ui/main.js index d3262ebfe..aec10d1e1 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -118,10 +118,9 @@ function _sessionsLoaded() { } function _initializePrefs() { - let overridesSchema = 'org.gnome.shell.overrides'; - let keys = new Gio.Settings({ schema: overridesSchema }).list_keys(); + let keys = new Gio.Settings({ schema: sessionMode.overridesSchema }).list_keys(); for (let i = 0; i < keys.length; i++) - Meta.prefs_override_preference_schema(keys[i], overridesSchema); + Meta.prefs_override_preference_schema(keys[i], sessionMode.overridesSchema); } function _initializeUI() { diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js index 4738c2e29..4c849abfb 100644 --- a/js/ui/sessionMode.js +++ b/js/ui/sessionMode.js @@ -16,6 +16,7 @@ const _modes = { 'restrictive': { parentMode: null, stylesheetName: 'gnome-shell.css', + overridesSchema: 'org.gnome.shell.overrides', hasOverview: false, showCalendarEvents: false, allowSettings: false,