diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ffb360a0c2..22b04ba6fb 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2008-12-04 Wang Xin <jedy.wang@sun.com> + + Fixes #501182. + + * gui/gnome-cal.c: (update_todo_view): Handle NULL pointer. + 2007-12-03 Milan Crha <mcrha@redhat.com> ** Fix for bug #440497 diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 768ed6e89b..bd6c8e710a 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1248,7 +1248,8 @@ update_todo_view (GnomeCalendar *gcal) model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)); if ((sexp = calendar_config_get_hide_completed_tasks_sexp (FALSE)) != NULL) { - priv->todo_sexp = g_strdup_printf ("(and %s %s)", sexp, priv->sexp); + priv->todo_sexp = g_strdup_printf ("(and %s %s)", sexp, + priv->sexp ? priv->sexp : ""); e_cal_model_set_search_query (model, priv->todo_sexp); g_free (sexp); } else { |