diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/calendar-config.c | 4 |
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); } |