[evolution-data-server] Bug 770198 - Do not override UTC time with a DTSTART zone in e-cal-recur

[Milan Crha <mcrha src gnome org>]

commit 5c7579d9eb9a885bb0ea5ddcca49e29c6f83202e
Author: Milan Crha <mcrha redhat com>
Date:   Tue Aug 23 08:38:02 2016 +0200

    Bug 770198 - Do not override UTC time with a DTSTART zone in e-cal-recur

 calendar/libecal/e-cal-recur.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index 099b8f2..cd61d4a 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -437,7 +437,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
                                rrule.until.minute = 0;
                                rrule.until.second = 0;
 
-                               if (!rrule.until.zone)
+                               if (!rrule.until.zone && !rrule.until.is_utc)
                                        rrule.until.zone = dtstart.zone;
                        }
 
@@ -544,7 +544,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
                                exrule.until.minute = 0;
                                exrule.until.second = 0;
 
-                               if (!exrule.until.zone)
+                               if (!exrule.until.zone && !exrule.until.is_utc)
                                        exrule.until.zone = dtstart.zone;
                        }
 
@@ -588,7 +588,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
                        if (!success)
                                break;
 
-                       if (!exdate.zone)
+                       if (!exdate.zone && !exdate.is_utc)
                                exdate.zone = dtstart.zone;
 
                        if (intersects_interval (&exdate, NULL, duration_days, duration_seconds, 
&interval_start, &interval_end)) {