From 73f94398abb6075214770b19e1ba2d178d433fdd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 14 Nov 2024 14:51:44 +0100 Subject: [PATCH] I#2902 - ToDo bar sometimes does not display due tasks Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2902 --- src/calendar/gui/e-to-do-pane.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/calendar/gui/e-to-do-pane.c b/src/calendar/gui/e-to-do-pane.c index 996af394e6..beff031024 100644 --- a/src/calendar/gui/e-to-do-pane.c +++ b/src/calendar/gui/e-to-do-pane.c @@ -1561,13 +1561,23 @@ etdp_check_time_changed (EToDoPane *to_do_pane, iso_end = isodate_from_time_t (tt_end); if (to_do_pane->priv->show_no_duedate_tasks) { if (to_do_pane->priv->show_completed_tasks) { - tasks_filter = g_strdup ("#t"); + tasks_filter = g_strdup_printf ( + "(or" + " (not (has-due?))" + " (due-in-time-range? (make-time \"%s\") (make-time \"%s\"))" + ")", + iso_begin_all, iso_end); } else { - tasks_filter = g_strdup ( + tasks_filter = g_strdup_printf ( "(and" - " (not (is-completed?))" - " (not (contains? \"status\" \"CANCELLED\"))" - ")"); + " (not (is-completed?))" + " (not (contains? \"status\" \"CANCELLED\"))" + " (or" + " (not (has-due?))" + " (due-in-time-range? (make-time \"%s\") (make-time \"%s\"))" + ")" + ")", + iso_begin_all, iso_end); } } else if (to_do_pane->priv->show_completed_tasks) { tasks_filter = g_strdup_printf (