[svn-commits] schmidts: branch 10 r364163 - /branches/10/res/

[SVN commits to the Digium repositories]

Author: schmidts
Date: Fri Apr 27 07:54:19 2012
New Revision: 364163

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


Modified:
    branches/10/res/res_calendar_caldav.c
    branches/10/res/res_calendar_icalendar.c

Modified: branches/10/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/res/res_calendar_caldav.c?view=diff&rev=364163&r1=364162&r2=364163
==============================================================================
--- branches/10/res/res_calendar_caldav.c (original)
+++ branches/10/res/res_calendar_caldav.c Fri Apr 27 07:54:19 2012
@@ -445,7 +445,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: branches/10/res/res_calendar_icalendar.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/res/res_calendar_icalendar.c?view=diff&rev=364163&r1=364162&r2=364163
==============================================================================
--- branches/10/res/res_calendar_icalendar.c (original)
+++ branches/10/res/res_calendar_icalendar.c Fri Apr 27 07:54:19 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);