[evolution/gnome-3-26] Bug 788112 - To Do Bar has recurring items from following week

[Milan Crha <mcrha src gnome org>]

commit 66fcd480ff17369d3a03aec5cc35d832ec885a2f
Author: Milan Crha <mcrha redhat com>
Date:   Fri Sep 29 10:47:02 2017 +0200

    Bug 788112 - To Do Bar has recurring items from following week

 src/calendar/gui/e-to-do-pane.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/calendar/gui/e-to-do-pane.c b/src/calendar/gui/e-to-do-pane.c
index 973d6a6..98728f1 100644
--- a/src/calendar/gui/e-to-do-pane.c
+++ b/src/calendar/gui/e-to-do-pane.c
@@ -602,7 +602,7 @@ etdp_get_component_root_paths (EToDoPane *to_do_pane,
                }
        }
 
-       if (!roots && first_root_path)
+       if (!roots && first_root_path && start_date_mark < prev_date_mark)
                roots = g_slist_prepend (roots, first_root_path);
        else
                gtk_tree_path_free (first_root_path);
@@ -1277,7 +1277,7 @@ etdp_check_time_changed (EToDoPane *to_do_pane,
 
                tt_begin = icaltime_as_timet_with_zone (itt, zone);
                tt_begin = time_day_begin_with_zone (tt_begin, zone);
-               tt_end = time_add_week_with_zone (tt_begin, 1, zone);
+               tt_end = time_add_week_with_zone (tt_begin, 1, zone) - 1;
 
                iso_begin_all = isodate_from_time_t (0);
                iso_begin = isodate_from_time_t (tt_begin);