[evolution/wip/gsettings: 18/29] NULL-terminate arrays that we pass to g_settings_set_strv



commit 74317a21839e419614e1c8fd91dcc3d601f1b858
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Oct 13 13:44:58 2011 +0200

    NULL-terminate arrays that we pass to g_settings_set_strv

 modules/calendar/e-cal-shell-backend.c  |    3 ++-
 modules/calendar/e-memo-shell-backend.c |    3 ++-
 modules/calendar/e-task-shell-backend.c |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 3ecb6bf..6259698 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -935,9 +935,10 @@ e_cal_shell_backend_set_selected_calendars (ECalShellBackend *cal_shell_backend,
 
 	for (l = selected_calendars; l != NULL; l = l->next)
 		g_ptr_array_add (array, l->data);
+	g_ptr_array_add (array, NULL);
 
 	settings = g_settings_new ("org.gnome.evolution.calendar");
-	g_settings_set_strv (settings, "selected-calendars", array->pdata);
+	g_settings_set_strv (settings, "selected-calendars", (const gchar *const *) array->pdata);
 	g_object_unref (settings);
 
 	g_ptr_array_free (array, FALSE);
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index b374afd..abbfdf7 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -680,9 +680,10 @@ e_memo_shell_backend_set_selected_memo_lists (EMemoShellBackend *memo_shell_back
 
 	for (l = selected_memo_lists; l != NULL; l = l->next)
 		g_ptr_array_add (array, l->data);
+	g_ptr_array_add (array, NULL);
 
 	settings = g_settings_new ("org.gnome.evolution.calendar");
-	g_settings_set_strv (settings, "selected-memos", array->pdata);
+	g_settings_set_strv (settings, "selected-memos", (const gchar *const *) array->pdata);
 	g_object_unref (settings);
 
 	g_ptr_array_free (array, FALSE);
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 19e84a6..39dcf4e 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -684,9 +684,10 @@ e_task_shell_backend_set_selected_task_lists (ETaskShellBackend *task_shell_back
 
 	for (l = selected_task_lists; l != NULL; l = l->next)
 		g_ptr_array_add (array, l->data);
+	g_ptr_array_add (array, NULL);
 
 	settings = g_settings_new ("org.gnome.evolution.calendar");
-        g_settings_set_strv (settings, "selected-tasks", array->pdata);
+	g_settings_set_strv (settings, "selected-tasks", (const gchar *const *) array->pdata);
 	g_object_unref (settings);
 
         g_ptr_array_free (array, FALSE);



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