aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 499d255534..4ceb714b8b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-02 Harish Krishnaswamy <kharish@novell.com>
+
+ * gui/dialogs/cal-prefs-dialog.c: (show_fb_config):
+ Fixes #325468 (critical warning crasher).
+
2005-12-30 Andre Klapper <a9016009@gmx.de>
* icalendar-importer.c: removed a duplicated exclamation mark.
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 0960033e41..f88ecd89cd 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -362,7 +362,7 @@ show_fb_config (CalendarPrefsDialog *prefs)
gchar *template_url;
template_url = calendar_config_get_free_busy_template ();
- gtk_entry_set_text (GTK_ENTRY (prefs->template_url), template_url);
+ gtk_entry_set_text (GTK_ENTRY (prefs->template_url), (template_url ? template_url : ""));
g_free (template_url);
}