From 14b52ff9dad3c9093a4375bc011ea4dde82de1f1 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 27 Apr 2012 12:58:03 +0000 Subject: fix a wrong behavior of alarm timezones in caldav and icalendar when an alarm doesnt use utc. This change uses the same timezone from the start time. ........ Merged revisions 364163 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@364164 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_calendar_caldav.c | 2 +- res/res_calendar_icalendar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index 55fd4f761..88b043290 100644 --- a/res/res_calendar_caldav.c +++ b/res/res_calendar_caldav.c @@ -456,7 +456,7 @@ static void caldav_add_event(icalcomponent *comp, struct icaltime_span *span, vo /* XXX Technically you can check RELATED to see if the event fires from the END of the event * But, I'm not sure I've ever seen anyone implement it in calendaring software, so I'm ignoring for now */ tmp = icaltime_add(start, trigger.duration); - event->alarm = icaltime_as_timet_with_zone(tmp, utc); + event->alarm = icaltime_as_timet_with_zone(tmp, icaltime_get_timezone(start)); } ao2_link(pvt->events, event); diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c index 8ef269e4f..61a400235 100644 --- a/res/res_calendar_icalendar.c +++ b/res/res_calendar_icalendar.c @@ -299,7 +299,7 @@ static void icalendar_add_event(icalcomponent *comp, struct icaltime_span *span, /* XXX Technically you can check RELATED to see if the event fires from the END of the event * But, I'm not sure I've ever seen anyone implement it in calendaring software, so I'm ignoring for now */ tmp = icaltime_add(start, trigger.duration); - event->alarm = icaltime_as_timet_with_zone(tmp, utc); + event->alarm = icaltime_as_timet_with_zone(tmp, icaltime_get_timezone(start)); } ao2_link(pvt->events, event); -- cgit v1.2.3