aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-04-09 14:41:03 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-04-09 14:41:03 +0800
commit247095e6117e06c11b99bc81fd55c6984d6d3a52 (patch)
treee3f20bce5ab14c76d5f446c2e2df5ba3bf45265d
parentec53e210fb9187aca09eae6e23590ee57bdbff7d (diff)
downloadgsoc2013-evolution-247095e6117e06c11b99bc81fd55c6984d6d3a52.tar
gsoc2013-evolution-247095e6117e06c11b99bc81fd55c6984d6d3a52.tar.gz
gsoc2013-evolution-247095e6117e06c11b99bc81fd55c6984d6d3a52.tar.bz2
gsoc2013-evolution-247095e6117e06c11b99bc81fd55c6984d6d3a52.tar.lz
gsoc2013-evolution-247095e6117e06c11b99bc81fd55c6984d6d3a52.tar.xz
gsoc2013-evolution-247095e6117e06c11b99bc81fd55c6984d6d3a52.tar.zst
gsoc2013-evolution-247095e6117e06c11b99bc81fd55c6984d6d3a52.zip
Fix for bug #415562 from Wang Xin
svn path=/branches/gnome-2-18/; revision=33409
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/gnome-cal.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 75b7aeb4bf..518f32fde3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-09 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #415562 from Wang Xin
+
+ * gui/gnome-cal.c: (update_todo_view): Fix for a critical warning
+ crasher.
+
2007-04-05 Matthew Barnes <mbarnes@redhat.com>
* gui/print.c (print_calendar): Fix a crasher. (#401539)
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index c400cc1ec2..a8161ed303 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1188,7 +1188,7 @@ 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 {