summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-06-29 09:58:35 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-06-29 09:58:35 -0400
commit9eb1377a821c3d1751ded9b70355ddde96874c65 (patch)
tree94f4a3b220259d6de951e9e6d3f491c001634a32
parentb9f1dd16798f147dc199646cf479213ccf1177c0 (diff)
downloadgconf-9eb1377a821c3d1751ded9b70355ddde96874c65.tar.gz
Make :path in groups optional again
It appears gsettings_new_from_path became stricter and doesn't allow a NULL path anymore. Oh well...
-rw-r--r--gsettings/gsettings-data-convert.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
index 156045a4..d61c4bee 100644
--- a/gsettings/gsettings-data-convert.c
+++ b/gsettings/gsettings-data-convert.c
@@ -84,7 +84,11 @@ handle_file (const gchar *filename)
g_print ("for storage at '%s'\n", schema_path[1]);
}
- settings = g_settings_new_with_path (schema_path[0], schema_path[1]);
+ if (schema_path[1] != NULL)
+ settings = g_settings_new_with_path (schema_path[0], schema_path[1]);
+ else
+ settings = g_settings_new (schema_path[0]);
+
g_settings_delay (settings);
error = NULL;