From: Stefan Schmidt Date: Fri, 27 Apr 2012 12:58:03 +0000 (+0000) Subject: fix a wrong behavior of alarm timezones in caldav and icalendar when an alarm doesnt... X-Git-Tag: 11.0.0-beta1~385 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b52ff9dad3c9093a4375bc011ea4dde82de1f1;p=thirdparty%2Fasterisk.git 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 --- diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index 55fd4f7613..88b0432907 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 8ef269e4f3..61a4002353 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);