aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/gnome-cal.c7
2 files changed, 11 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b5edba679e..7f4035f554 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-05 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #501474
+
+ * gui/gnome-cal.c: (update_memo_view):
+ Fix wrong expression from bug #359267
+
2007-12-04 David Turner <cillian64@googlemail.com>
** Fix for bug #354265
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index bd6c8e710a..98dc0c566d 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1282,11 +1282,12 @@ update_memo_view (GnomeCalendar *gcal)
g_free (priv->memo_sexp);
}
- priv->memo_sexp = g_strdup_printf ("(not (has-start?)) or (and (occur-in-time-range? (make-time \"%s\")"
- " (make-time \"%s\"))"
- " %s)",
+ priv->memo_sexp = g_strdup_printf ("(or (not (has-start?)) (and (occur-in-time-range? (make-time \"%s\")"
+ " (make-time \"%s\"))"
+ " %s))",
iso_start, iso_end,
priv->sexp ? priv->sexp : "");
+
e_cal_model_set_search_query (model, priv->memo_sexp);
g_free (iso_start);