[evolution/gnome-3-32] I#437 - [To Do Bar] Leftover task after DUE date change

[Milan Crha <mcrha src gnome org>]

commit c52e84780489ac65a4014770ec7046682b733b75
Author: Milan Crha <mcrha redhat com>
Date:   Tue May 7 14:56:02 2019 +0200

    I#437 - [To Do Bar] Leftover task after DUE date change
    
    Closes https://gitlab.gnome.org/GNOME/evolution/issues/437

 src/calendar/gui/e-to-do-pane.c | 53 +++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 20 deletions(-)
---
diff --git a/src/calendar/gui/e-to-do-pane.c b/src/calendar/gui/e-to-do-pane.c
index 4cea7d8a99..5ae70f6b4f 100644
--- a/src/calendar/gui/e-to-do-pane.c
+++ b/src/calendar/gui/e-to-do-pane.c
@@ -860,6 +860,35 @@ etdp_get_comp_colors (EToDoPane *to_do_pane,
        *out_fgcolor = fgcolor;
 }
 
+static void
+etdp_remove_ident (EToDoPane *to_do_pane,
+                  ComponentIdent *ident)
+{
+       GSList *link;
+
+       g_return_if_fail (E_IS_TO_DO_PANE (to_do_pane));
+       g_return_if_fail (ident != NULL);
+
+       for (link = g_hash_table_lookup (to_do_pane->priv->component_refs, ident); link; link = g_slist_next 
(link)) {
+               GtkTreeRowReference *reference = link->data;
+
+               if (reference && gtk_tree_row_reference_valid (reference)) {
+                       GtkTreePath *path;
+                       GtkTreeIter iter;
+
+                       path = gtk_tree_row_reference_get_path (reference);
+
+                       if (path && gtk_tree_model_get_iter (gtk_tree_row_reference_get_model (reference), 
&iter, path)) {
+                               gtk_tree_store_remove (to_do_pane->priv->tree_store, &iter);
+                       }
+
+                       gtk_tree_path_free (path);
+               }
+       }
+
+       g_hash_table_remove (to_do_pane->priv->component_refs, ident);
+}
+
 static void
 etdp_add_component (EToDoPane *to_do_pane,
                    ECalClient *client,
@@ -900,8 +929,10 @@ etdp_add_component (EToDoPane *to_do_pane,
        /* This can happen with "Show Tasks without Due date", which returns
           basically all tasks, even with Due date in the future, out of
           the interval used by the To Do bar. */
-       if (!new_root_paths)
+       if (!new_root_paths) {
+               etdp_remove_ident (to_do_pane, ident);
                goto exit;
+       }
 
        new_references = etdp_merge_with_root_paths (to_do_pane, model, new_root_paths,
                g_hash_table_lookup (to_do_pane->priv->component_refs, ident));
@@ -1133,7 +1164,6 @@ etdp_data_subscriber_component_removed (ECalDataModelSubscriber *subscriber,
 {
        EToDoPane *to_do_pane;
        ComponentIdent ident;
-       GSList *link;
 
        g_return_if_fail (E_IS_TO_DO_PANE (subscriber));
 
@@ -1143,24 +1173,7 @@ etdp_data_subscriber_component_removed (ECalDataModelSubscriber *subscriber,
        ident.uid = (gchar *) uid;
        ident.rid = (gchar *) (rid && *rid ? rid : NULL);
 
-       for (link = g_hash_table_lookup (to_do_pane->priv->component_refs, &ident); link; link = g_slist_next 
(link)) {
-               GtkTreeRowReference *reference = link->data;
-
-               if (reference && gtk_tree_row_reference_valid (reference)) {
-                       GtkTreePath *path;
-                       GtkTreeIter iter;
-
-                       path = gtk_tree_row_reference_get_path (reference);
-
-                       if (path && gtk_tree_model_get_iter (gtk_tree_row_reference_get_model (reference), 
&iter, path)) {
-                               gtk_tree_store_remove (to_do_pane->priv->tree_store, &iter);
-                       }
-
-                       gtk_tree_path_free (path);
-               }
-       }
-
-       g_hash_table_remove (to_do_pane->priv->component_refs, &ident);
+       etdp_remove_ident (to_do_pane, &ident);
 }
 
 static void