From 636df18f641b44e614c4cf8983aab02a7f0ef1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= Date: Mon, 16 Mar 2015 12:37:43 -0400 Subject: [PATCH] event-widget: convert date/time to local timezone --- src/gcal-event-widget.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/gcal-event-widget.c b/src/gcal-event-widget.c index 0dfa545b..e1c728ad 100644 --- a/src/gcal-event-widget.c +++ b/src/gcal-event-widget.c @@ -731,7 +731,12 @@ gcal_event_widget_new_from_data (GcalEventData *data) start_is_date = date->is_date == 1; if (!start_is_date) - *date = icaltime_convert_to_zone (*(dt.value), e_cal_util_get_system_timezone ()); + { + if (dt.tzid != NULL) + dt.value->zone = icaltimezone_get_builtin_timezone_from_tzid (dt.tzid); + *date = icaltime_convert_to_zone (*(dt.value), + e_cal_util_get_system_timezone ()); + } gcal_event_widget_set_date (event, date); e_cal_component_free_datetime (&dt); @@ -745,7 +750,12 @@ gcal_event_widget_new_from_data (GcalEventData *data) end_is_date = date->is_date == 1; if (!end_is_date) - *date = icaltime_convert_to_zone (*(dt.value), e_cal_util_get_system_timezone ()); + { + if (dt.tzid != NULL) + dt.value->zone = icaltimezone_get_builtin_timezone_from_tzid (dt.tzid); + *date = icaltime_convert_to_zone (*(dt.value), + e_cal_util_get_system_timezone ()); + } gcal_event_widget_set_end_date (event, date); e_cal_component_free_datetime (&dt);