[gconf] Make :path in groups optional again



commit 9eb1377a821c3d1751ded9b70355ddde96874c65
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jun 29 09:58:35 2010 -0400

    Make :path in groups optional again
    
    It appears gsettings_new_from_path became stricter and doesn't
    allow a NULL path anymore. Oh well...

 gsettings/gsettings-data-convert.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
index 156045a..d61c4be 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;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]