[evolution] [EToDoPane] With completed hide also cancelled tasks

[Milan Crha <mcrha src gnome org>]

commit fcbb25548e337d3de4b434ff3fecd968fbc112f1
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 10 18:39:09 2018 +0200

    [EToDoPane] With completed hide also cancelled tasks

 src/calendar/gui/e-to-do-pane.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/calendar/gui/e-to-do-pane.c b/src/calendar/gui/e-to-do-pane.c
index de93c3b..ac6c3eb 100644
--- a/src/calendar/gui/e-to-do-pane.c
+++ b/src/calendar/gui/e-to-do-pane.c
@@ -1353,13 +1353,18 @@ etdp_check_time_changed (EToDoPane *to_do_pane,
                        if (to_do_pane->priv->show_completed_tasks) {
                                tasks_filter = g_strdup ("#t");
                        } else {
-                               tasks_filter = g_strdup ("(not (is-completed?))");
+                               tasks_filter = g_strdup (
+                                       "(and"
+                                       " (not (is-completed?))"
+                                       " (not (contains? \"status\" \"CANCELLED\"))"
+                                       ")");
                        }
                } else if (to_do_pane->priv->show_completed_tasks) {
                        tasks_filter = g_strdup_printf (
                                        "(or"
                                        " (and"
                                         " (not (is-completed?))"
+                                        " (not (contains? \"status\" \"CANCELLED\"))"
                                         " (due-in-time-range? (make-time \"%s\") (make-time \"%s\"))"
                                         ")"
                                        " (and"
@@ -1371,6 +1376,7 @@ etdp_check_time_changed (EToDoPane *to_do_pane,
                        tasks_filter = g_strdup_printf (
                                        "(and"
                                        " (not (is-completed?))"
+                                       " (not (contains? \"status\" \"CANCELLED\"))"
                                        " (due-in-time-range? (make-time \"%s\") (make-time \"%s\"))"
                                        ")",
                                        iso_begin_all, iso_end);