fix a wrong behavior of alarm timezones in caldav and icalendar when an alarm doesnt...
authorStefan Schmidt <sst@sil.at>
Fri, 27 Apr 2012 12:58:03 +0000 (12:58 +0000)
committerStefan Schmidt <sst@sil.at>
Fri, 27 Apr 2012 12:58:03 +0000 (12:58 +0000)
........

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
res/res_calendar_icalendar.c

index 55fd4f7..88b0432 100644 (file)
@@ -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);
index 8ef269e..61a4002 100644 (file)
@@ -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);