[glib/new-gsettings] Fix various issues in memory backend
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/new-gsettings] Fix various issues in memory backend
- Date: Wed, 14 Apr 2010 22:16:21 +0000 (UTC)
commit 28839ce5931b612973d1a63c95de8a6396ded15d
Author: Vincent Untz <vuntz gnome org>
Date: Wed Apr 14 18:14:50 2010 -0400
Fix various issues in memory backend
- path saved without trailing slash in keyfile
- pass "" prefix to g_settings_backend_keys_changed() instead of NULL
- ignore context that is an empty string
gio/gmemorysettingsbackend.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gio/gmemorysettingsbackend.c b/gio/gmemorysettingsbackend.c
index 5c48ff0..34a9b14 100644
--- a/gio/gmemorysettingsbackend.c
+++ b/gio/gmemorysettingsbackend.c
@@ -55,7 +55,7 @@ g_memory_settings_backend_write_one (const gchar *key,
slash = strrchr (key, '/');
g_assert (slash != NULL);
base_key = (slash + 1);
- path = g_strndup (key, slash - key);
+ path = g_strndup (key, slash - key + 1);
g_key_file_set_string (memory->priv->keyfile,
path, base_key, g_variant_print (value, FALSE));
@@ -245,7 +245,7 @@ g_memory_settings_backend_keyfile_reload (GMemorySettingsBackend *memory)
/* the array has to be NULL-terminated */
g_ptr_array_add (changed_array, NULL);
g_settings_backend_keys_changed (G_SETTINGS_BACKEND (memory),
- NULL,
+ "",
(const gchar **) changed_array->pdata,
NULL);
}
@@ -315,7 +315,7 @@ g_memory_settings_backend_constructed (GObject *object)
context = NULL;
g_object_get (memory, "context", &context, NULL);
- if (context)
+ if (context && context[0] != '\0')
{
memory->priv->keyfile_path = g_strdup_printf ("%s.%s", path, context);
g_free (context);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]