aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorJeff Cai <jeff.cai@sun.com>2006-03-04 19:25:18 +0800
committerSimon Zheng <simonz@src.gnome.org>2006-03-04 19:25:18 +0800
commitda871f9ad34ad978ec92e2fc10aa2505248ac14e (patch)
treefb0d13252eeb3647d2b8871f9f314fbbcff5ff81 /calendar
parenta684fc327a375ceabb6fbf0e0291041f4f176d36 (diff)
downloadgsoc2013-evolution-da871f9ad34ad978ec92e2fc10aa2505248ac14e.tar.gz
gsoc2013-evolution-da871f9ad34ad978ec92e2fc10aa2505248ac14e.tar.zst
gsoc2013-evolution-da871f9ad34ad978ec92e2fc10aa2505248ac14e.zip
Fixes #333234 Initialize calendar to ensure gconf_client is valid.
2006-03-04 Jeff Cai <jeff.cai@sun.com> Fixes #333234 * gui/calendar-config.c: (calendar_config_get_primary_tasks), (calendar_config_get_primary_memos): Initialize calendar to ensure gconf_client is valid. svn path=/trunk/; revision=31641
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/calendar-config.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d345bc84b8..266ced9bf2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-04 Jeff Cai <jeff.cai@sun.com>
+
+ Fixes #333234
+ * gui/calendar-config.c: (calendar_config_get_primary_tasks),
+ (calendar_config_get_primary_memos):
+ Initialize calendar to ensure gconf_client is valid.
+
2006-03-04 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #331089
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index c3af59e82f..b93e589194 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -728,6 +728,8 @@ calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpo
char *
calendar_config_get_primary_tasks (void)
{
+ calendar_config_init ();
+
return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, NULL);
}
@@ -790,6 +792,8 @@ calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpo
char *
calendar_config_get_primary_memos (void)
{
+ calendar_config_init ();
+
return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, NULL);
}