main: Actually use the correct schema for overrides

Fix commit ae2751a68b to not only pick up the keys from the
correct schema, but also use the correct schema-id for the overrides.
This commit is contained in:
Florian Müllner 2014-06-10 12:58:01 +02:00
parent 3b7756b610
commit b981a591c7

View File

@ -174,16 +174,19 @@ shell_prefs_init (void)
{ {
ShellGlobal *global = shell_global_get (); ShellGlobal *global = shell_global_get ();
GSettings *settings = shell_global_get_overrides_settings (global); GSettings *settings = shell_global_get_overrides_settings (global);
char **keys, **k; char **keys, **k, *schema_id;
if (!settings) if (!settings)
return; return;
g_object_get (G_OBJECT (settings), "schema-id", &schema_id, NULL);
keys = g_settings_list_keys (settings); keys = g_settings_list_keys (settings);
for (keys = k = g_settings_list_keys (settings); *k; k++) 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_strfreev (keys);
g_free (schema_id);
} }
static void static void