amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-19 20:09:28 +00:00
Code Issues Projects Releases Wiki Activity

merge of '00c385f170e269a8305d89f7f557f6ee66aa5904'

Browse Source 
and 'b87371b5b686da6d0d84e233c3ffbd8f8f9fbe1f'

Monotone-Parent: 00c385f170e269a8305d89f7f557f6ee66aa5904
Monotone-Parent: b87371b5b686da6d0d84e233c3ffbd8f8f9fbe1f
Monotone-Revision: 7e03e68f3bd26f03d5835176e1850405de4fe8b5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-18T18:30:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-10-18 18:30:43 +00:00
parent a352c05d22 0a4c54b063
commit c7d90c31b2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SOPE/NGCards/iCalTimeZone.m
View File

@@ -130,8 +130,8 @@ static NSMutableDictionary *cache;
return [[self uniqueChildWithTag: @"tzid"] value: 0];
}
- (NSCalendarDate *) _occurenceForPeriodNamed: (NSString *) pName
forDate: (NSCalendarDate *) aDate
- (NSCalendarDate *) _occurrenceForPeriodNamed: (NSString *) pName
forDate: (NSCalendarDate *) aDate
{
NSArray *periods;
iCalTimeZonePeriod *period;
@@ -157,10 +157,10 @@ static NSMutableDictionary *cache;
/* FIXME, this could cause crashes when timezones are not properly
specified, but let's say it won't happen often... */
daylightOccurence = [self _occurenceForPeriodNamed: @"daylight"
forDate: date];
standardOccurence = [self _occurenceForPeriodNamed: @"standard"
forDate: date];
daylightOccurence = [self _occurrenceForPeriodNamed: @"daylight"
forDate: date];
standardOccurence = [self _occurrenceForPeriodNamed: @"standard"
forDate: date];
if (!standardOccurence)
period = (iCalTimeZonePeriod *) [self uniqueChildWithTag: @"daylight"];