Monotone-Parent: 4aae300745a9f879663e6201551f31afbe4aa8ff

Monotone-Revision: 72e46ed049fae790f8f694c94e8ab035260d1289

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-12T16:29:15
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-12-12 16:29:15 +00:00
parent c46d504236
commit 53ab38a3c1
2 changed files with 14 additions and 3 deletions

View File

@@ -1,3 +1,9 @@
2007-12-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* iCalTimeZone.m ([iCalTimeZone -periodForDate:date]): at least
one timezone period is needed so we might need to fallback on the
only one present if the other does not exist.
2007-11-29 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* iCalDateTime.m ([iCalDateTime -timeZone]): log a message if the

View File

@@ -89,13 +89,18 @@
forDate: date];
standardOccurence = [self _occurenceForPeriodNamed: @"standard"
forDate: date];
if ([date earlierDate: daylightOccurence] == date
|| [date earlierDate: standardOccurence] == standardOccurence)
if (!standardOccurence)
period = (iCalTimeZonePeriod *) [self uniqueChildWithTag: @"daylight"];
else if (!daylightOccurence)
period = (iCalTimeZonePeriod *) [self uniqueChildWithTag: @"standard"];
else if ([date earlierDate: daylightOccurence] == date
|| [date earlierDate: standardOccurence] == standardOccurence)
period = (iCalTimeZonePeriod *) [self uniqueChildWithTag: @"standard"];
else
period = (iCalTimeZonePeriod *) [self uniqueChildWithTag: @"daylight"];
NSLog (@"chosen period: '%@'", [period tag]);
// NSLog (@"chosen period: '%@'", [period tag]);
return period;
}