Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3001
diff -u -r1.3001 ChangeLog
--- ChangeLog	28 Feb 2006 12:16:43 -0000	1.3001
+++ ChangeLog	3 Mar 2006 10:44:55 -0000
@@ -1,3 +1,10 @@
+2006-03-03  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-02-28  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #332726
Index: gui/calendar-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-config.c,v
retrieving revision 1.85
diff -u -r1.85 calendar-config.c
--- gui/calendar-config.c	13 Jan 2006 11:02:13 -0000	1.85
+++ gui/calendar-config.c	3 Mar 2006 10:44:55 -0000
@@ -718,6 +718,8 @@
 char *
 calendar_config_get_primary_tasks (void)
 {
+	calendar_config_init ();
+
 	return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, NULL);
 }
 
@@ -780,6 +782,8 @@
 char *
 calendar_config_get_primary_memos (void)
 {
+	calendar_config_init ();
+
 	return gconf_client_get_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, NULL);
 }
 
