From b981a591c76176b1fb728131032368222c8f840a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 10 Jun 2014 12:58:01 +0200 Subject: [PATCH] main: Actually use the correct schema for overrides Fix commit ae2751a68b20ab to not only pick up the keys from the correct schema, but also use the correct schema-id for the overrides. --- src/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index a2f497cf8..4070482e1 100644 --- a/src/main.c +++ b/src/main.c @@ -174,16 +174,19 @@ shell_prefs_init (void) { ShellGlobal *global = shell_global_get (); GSettings *settings = shell_global_get_overrides_settings (global); - char **keys, **k; + char **keys, **k, *schema_id; if (!settings) return; + g_object_get (G_OBJECT (settings), "schema-id", &schema_id, NULL); + keys = g_settings_list_keys (settings); for (keys = k = g_settings_list_keys (settings); *k; k++) - meta_prefs_override_preference_schema (*k, OVERRIDES_SCHEMA); + meta_prefs_override_preference_schema (*k, schema_id); g_strfreev (keys); + g_free (schema_id); } static void