Monotone-Parent: 76bba460617a7f4d7ee1f66a47e8918059e6f046

Monotone-Revision: 379924109229c07d133fc063329a33e5f0dc987d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-03T21:42:23
maint-2.0.2
Francis Lachapelle 2012-01-03 21:42:23 +00:00
parent cbe9d53728
commit 51cd566744
1 changed files with 9 additions and 5 deletions

View File

@ -457,7 +457,7 @@
{
WOResponse *result;
NSDictionary *data;
NSCalendarDate *eventDate;
NSCalendarDate *eventStartDate, *eventEndDate;
NSTimeZone *timeZone;
SOGoUserDefaults *ud;
SOGoCalendarComponent *co;
@ -469,8 +469,10 @@
result = [self responseWithStatus: 200];
ud = [[context activeUser] userDefaults];
timeZone = [ud timeZone];
eventDate = [event startDate];
[eventDate setTimeZone: timeZone];
eventStartDate = [event startDate];
eventEndDate = [event endDate];
[eventStartDate setTimeZone: timeZone];
[eventEndDate setTimeZone: timeZone];
co = [self clientObject];
if (!componentCalendar)
@ -507,8 +509,10 @@
data = [NSDictionary dictionaryWithObjectsAndKeys:
[componentCalendar displayName], @"calendar",
[event tag], @"component",
[dateFormatter formattedDate: eventDate], @"startDate",
[dateFormatter formattedTime: eventDate], @"startTime",
[dateFormatter formattedDate: eventStartDate], @"startDate",
[dateFormatter formattedTime: eventStartDate], @"startTime",
[dateFormatter formattedDate: eventEndDate], @"endDate",
[dateFormatter formattedTime: eventEndDate], @"endTime",
([event hasRecurrenceRules] ? @"1": @"0"), @"isRecurring",
([event isAllDay] ? @"1": @"0"), @"isAllDay",
[event summary], @"summary",