aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorWang Xin <jedy.wang@sun.com>2007-12-04 12:50:10 +0800
committerJedy Jedy Wang <jedywang@src.gnome.org>2007-12-04 12:50:10 +0800
commita8b79a08d61159b770c16f557673e93a29ebfeab (patch)
treeb61ecbaae887f1bf11f24258dec0c6e6b0850537 /calendar
parent2382c13eb142708eabc7d086048fec40cfce092b (diff)
downloadgsoc2013-evolution-a8b79a08d61159b770c16f557673e93a29ebfeab.tar
gsoc2013-evolution-a8b79a08d61159b770c16f557673e93a29ebfeab.tar.gz
gsoc2013-evolution-a8b79a08d61159b770c16f557673e93a29ebfeab.tar.bz2
gsoc2013-evolution-a8b79a08d61159b770c16f557673e93a29ebfeab.tar.lz
gsoc2013-evolution-a8b79a08d61159b770c16f557673e93a29ebfeab.tar.xz
gsoc2013-evolution-a8b79a08d61159b770c16f557673e93a29ebfeab.tar.zst
gsoc2013-evolution-a8b79a08d61159b770c16f557673e93a29ebfeab.zip
Fixes #501182.
2008-12-04 Wang Xin <jedy.wang@sun.com> Fixes #501182. * gui/gnome-cal.c: (update_todo_view): Handle NULL pointer. svn path=/trunk/; revision=34631
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/gnome-cal.c3
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 {