summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sauer <ensonic@users.sf.net>2013-01-23 08:11:18 +0100
committerStefan Sauer <ensonic@users.sf.net>2013-01-23 08:11:18 +0100
commit98ff7acca7595f508b094506195aeffaf2e8b74c (patch)
tree30a3bd2bbb4f5dd66034bb3e47ff9dc14e82653f
parente3622a6e792ff442f6c76213751f711474388401 (diff)
downloadgconf-98ff7acca7595f508b094506195aeffaf2e8b74c.tar.gz
mconvert: enable recursive scheme lookup and fix a crasher
The recursive scheme lookup is needed to scan the whole settings path. The crash would happen in the case of a misconfiguration (e.g. building gconf from source and running uninstalled while the configure settings don't match the one used to create the installed package).
-rw-r--r--gsettings/gsettings-data-convert.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
index a8af942c..9b2d1d02 100644
--- a/gsettings/gsettings-data-convert.c
+++ b/gsettings/gsettings-data-convert.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
@@ -90,6 +91,10 @@ get_writable_client (void)
GSList *addresses;
addresses = get_writable_source_path ();
+ if (!addresses) {
+ g_printf("No writable gconf locations found\n");
+ exit (1);
+ }
engine = gconf_engine_get_local_for_addresses (addresses, NULL);
gconf_address_list_free (addresses);
@@ -155,7 +160,7 @@ handle_file (const gchar *filename)
schema_path = g_strsplit (groups[i], ":", 2);
- schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE);
+ schema = g_settings_schema_source_lookup (source, schema_path[0], TRUE);
if (schema == NULL)
{
if (verbose)