[svn-commits] schmidts: trunk r364164 - in /trunk: ./ res/

[SVN commits to the Digium repositories]

Author: schmidts
Date: Fri Apr 27 07:58:03 2012
New Revision: 364164

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364164
Log:
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

Modified:
    trunk/   (props changed)
    trunk/res/res_calendar_caldav.c
    trunk/res/res_calendar_icalendar.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_calendar_caldav.c?view=diff&rev=364164&r1=364163&r2=364164
==============================================================================
--- trunk/res/res_calendar_caldav.c (original)
+++ trunk/res/res_calendar_caldav.c Fri Apr 27 07:58:03 2012
@@ -456,7 +456,7 @@
 		/* 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);

Modified: trunk/res/res_calendar_icalendar.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_calendar_icalendar.c?view=diff&rev=364164&r1=364163&r2=364164
==============================================================================
--- trunk/res/res_calendar_icalendar.c (original)
+++ trunk/res/res_calendar_icalendar.c Fri Apr 27 07:58:03 2012
@@ -299,7 +299,7 @@
 		/* 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);