[evolution] Bug 794718 - Calendar List view shows wrong start/end time (when in UTC)

[Milan Crha <mcrha src gnome org>]

commit ef4194d17d8595ab61535022183c12f58dd743aa
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 3 13:56:34 2018 +0200

    Bug 794718 - Calendar List view shows wrong start/end time (when in UTC)

 src/calendar/gui/e-cal-model-calendar.c |    4 ----
 src/calendar/gui/e-cal-model.c          |    9 +++------
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/src/calendar/gui/e-cal-model-calendar.c b/src/calendar/gui/e-cal-model-calendar.c
index e5dd927..8ce31da 100644
--- a/src/calendar/gui/e-cal-model-calendar.c
+++ b/src/calendar/gui/e-cal-model-calendar.c
@@ -70,8 +70,6 @@ get_dtend (ECalModelCalendar *model,
 
                if (got_zone) {
                        tt_end = icaltime_from_timet_with_zone (comp_data->instance_end, tt_end.is_date, 
zone);
-                       if (model_zone)
-                               icaltimezone_convert_time (&tt_end, zone, model_zone);
                } else {
                        tt_end = icaltime_from_timet_with_zone (
                                comp_data->instance_end,
@@ -94,8 +92,6 @@ get_dtend (ECalModelCalendar *model,
 
                        if (got_start_zone) {
                                tt_start = icaltime_from_timet_with_zone (comp_data->instance_start, 
tt_start.is_date, start_zone);
-                               if (model_zone)
-                                       icaltimezone_convert_time (&tt_start, start_zone, model_zone);
                        } else {
                                tt_start = icaltime_from_timet_with_zone (
                                        comp_data->instance_start,
diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c
index 50195b7..ffb55c0 100644
--- a/src/calendar/gui/e-cal-model.c
+++ b/src/calendar/gui/e-cal-model.c
@@ -369,13 +369,10 @@ get_dtstart (ECalModel *model,
                        got_zone = TRUE;
 
                if (e_cal_data_model_get_expand_recurrences (priv->data_model)) {
-                       if (got_zone) {
+                       if (got_zone)
                                tt_start = icaltime_from_timet_with_zone (comp_data->instance_start, 
tt_start.is_date, zone);
-                               if (priv->zone)
-                                       icaltimezone_convert_time (&tt_start, zone, priv->zone);
-                       } else
-                               if (priv->zone)
-                                       tt_start = icaltime_from_timet_with_zone (comp_data->instance_start, 
tt_start.is_date, priv->zone);
+                       else if (priv->zone)
+                               tt_start = icaltime_from_timet_with_zone (comp_data->instance_start, 
tt_start.is_date, priv->zone);
                }
 
                if (!icaltime_is_valid_time (tt_start) || icaltime_is_null_time (tt_start))