Merge branch 'wip/gsettings'

1 files changed, 26 insertions, 15 deletions

diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index ed4e81d559..c31689fec9 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -645,18 +645,24 @@ e_memo_shell_backend_get_source_list (EMemoShellBackend *memo_shell_backend)
 GSList *
 e_memo_shell_backend_get_selected_memo_lists (EMemoShellBackend *memo_shell_backend)
 {
-	GConfClient *client;
-	GSList *selected_memo_lists;
-	const gchar *key;
+	GSettings *settings;
+	GSList *selected_memo_lists = NULL;
+	gchar **strv;
+	gint ii;
 
 	g_return_val_if_fail (
 		E_IS_MEMO_SHELL_BACKEND (memo_shell_backend), NULL);
 
-	client = gconf_client_get_default ();
-	key = "/apps/evolution/calendar/memos/selected_memos";
-	selected_memo_lists = gconf_client_get_list (
-		client, key, GCONF_VALUE_STRING, NULL);
-	g_object_unref (client);
+	settings = g_settings_new ("org.gnome.evolution.calendar");
+	strv = g_settings_get_strv (settings, "selected-memos");
+	g_object_unref (settings);
+
+	if (strv != NULL) {
+		for (ii = 0; strv[ii] != NULL; ii++)
+			selected_memo_lists = g_slist_append (selected_memo_lists, g_strdup (strv[ii]));
+
+		g_strfreev (strv);
+	}
 
 	return selected_memo_lists;
 }
@@ -665,14 +671,19 @@ void
 e_memo_shell_backend_set_selected_memo_lists (EMemoShellBackend *memo_shell_backend,
                                               GSList *selected_memo_lists)
 {
-	GConfClient *client;
-	const gchar *key;
+	GSettings *settings;
+	GSList *link;
+	GPtrArray *array = g_ptr_array_new ();
 
 	g_return_if_fail (E_IS_MEMO_SHELL_BACKEND (memo_shell_backend));
 
-	client = gconf_client_get_default ();
-	key = "/apps/evolution/calendar/memos/selected_memos";
-	gconf_client_set_list (
-		client, key, GCONF_VALUE_STRING, selected_memo_lists, NULL);
-	g_object_unref (client);
+	for (link = selected_memo_lists; link != NULL; link = link->next)
+		g_ptr_array_add (array, link->data);
+	g_ptr_array_add (array, NULL);
+
+	settings = g_settings_new ("org.gnome.evolution.calendar");
+	g_settings_set_strv (settings, "selected-memos", (const gchar *const *) array->pdata);
+	g_object_unref (settings);
+
+	g_ptr_array_free (array, FALSE);
 }