merge of '4da10cc5d7b04371c2d5f407c3a25e5ae2bce8df'
and 'dfcee5ab2e9d3d65c64801fc45b75ab2a873cfce' Monotone-Parent: 4da10cc5d7b04371c2d5f407c3a25e5ae2bce8df Monotone-Parent: dfcee5ab2e9d3d65c64801fc45b75ab2a873cfce Monotone-Revision: 5f0b5fde09b45b6e60e9302afb433346dcc0c2b8 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-03-24T15:28:28 Monotone-Branch: ca.inverse.sogomaint-2.0.2
commit
8aebcff95b
|
@ -49,6 +49,7 @@ static NSArray *knownTimeZones;
|
|||
+ (void) initialize
|
||||
{
|
||||
cache = [[NSMutableDictionary alloc] init];
|
||||
knownTimeZones = nil;
|
||||
}
|
||||
|
||||
+ (iCalTimeZone *) timeZoneForName: (NSString *) theName
|
||||
|
@ -124,9 +125,7 @@ static NSArray *knownTimeZones;
|
|||
NSRange ext;
|
||||
BOOL b;
|
||||
|
||||
timeZoneNames = knownTimeZones;
|
||||
|
||||
if (!timeZoneNames)
|
||||
if (!knownTimeZones)
|
||||
{
|
||||
timeZoneNames = [NSMutableArray new];
|
||||
|
||||
|
@ -156,11 +155,11 @@ static NSArray *knownTimeZones;
|
|||
}
|
||||
}
|
||||
}
|
||||
knownTimeZones = [timeZoneNames sortedArrayUsingSelector: @selector (localizedCaseInsensitiveCompare:)];
|
||||
knownTimeZones = [NSArray arrayWithArray: timeZoneNames];
|
||||
[knownTimeZones retain];
|
||||
}
|
||||
|
||||
return timeZoneNames;
|
||||
return knownTimeZones;
|
||||
}
|
||||
|
||||
- (Class) classForTag: (NSString *) classTag
|
||||
|
|
|
@ -153,7 +153,7 @@
|
|||
|
||||
- (NSArray *) timeZonesList
|
||||
{
|
||||
return [iCalTimeZone knownTimeZoneNames];
|
||||
return [[iCalTimeZone knownTimeZoneNames] sortedArrayUsingSelector: @selector (localizedCaseInsensitiveCompare:)];
|
||||
}
|
||||
|
||||
- (NSString *) userTimeZone
|
||||
|
|
Loading…
Reference in New Issue