LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See Changelog 

Monotone-Parent: 85c6ffe1d09e38fb08d3e2069fab3f885c576b0e
Monotone-Revision: 5950d93fbbb7ef6a3132a3c725a153f854b3e983

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-02-23T16:33:29
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2011-02-23 16:33:29 +00:00
parent 988eb09918
commit 0fdacd7d8a
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2011-02-23 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-fixupCycleRecord:cycleRange:firstInstanceCalendarDateRange:withEventTimeZone:):
avoid fixing the timezone if no event timezone is defined.
* SoObjects/Appointments/SOGoCalendarComponent.m
(-newOccurenceWithID): set the occurrence timezone to the user's
timezone. This fixes an issue when accessing occurrences of a

14
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@ -659,8 +659,11 @@ static NSNumber *sharedYes = nil;
record = [[theRecord mutableCopy] autorelease];
date = [theCycle startDate];
secondsOffsetFromGMT = (int) [[theEventTimeZone periodForDate: date] secondsOffsetFromGMT];
date = [date dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 0 seconds: -secondsOffsetFromGMT];
if (theEventTimeZone)
{
secondsOffsetFromGMT = (int) [[theEventTimeZone periodForDate: date] secondsOffsetFromGMT];
date = [date dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 0 seconds: -secondsOffsetFromGMT];
}
[date setTimeZone: timeZone];
[record setObject: date forKey: @"startDate"];
dateSecs = [NSNumber numberWithInt: [date timeIntervalSince1970]];
@ -668,8 +671,11 @@ static NSNumber *sharedYes = nil;
[record setObject: dateSecs forKey: @"c_recurrence_id"];
date = [theCycle endDate];
secondsOffsetFromGMT = (int) [[theEventTimeZone periodForDate: date] secondsOffsetFromGMT];
date = [date dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 0 seconds: -secondsOffsetFromGMT];
if (theEventTimeZone)
{
secondsOffsetFromGMT = (int) [[theEventTimeZone periodForDate: date] secondsOffsetFromGMT];
date = [date dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 0 seconds: -secondsOffsetFromGMT];
}
[date setTimeZone: timeZone];
[record setObject: date forKey: @"endDate"];
dateSecs = [NSNumber numberWithInt: [date timeIntervalSince1970]];