Fixed sorting of timezones in preferences module.

Monotone-Parent: ee0810b737d9d978b856ca04e9102d7985d6bf82
Monotone-Revision: dfcee5ab2e9d3d65c64801fc45b75ab2a873cfce

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-03-24T14:43:52
Monotone-Branch: ca.inverse.sogo

SOPE/NGCards/iCalTimeZone.m

@@ -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

UI/PreferencesUI/UIxPreferences.m

@@ -153,7 +153,7 @@
 
 - (NSArray *) timeZonesList
 {
-  return [iCalTimeZone knownTimeZoneNames];
+  return [[iCalTimeZone knownTimeZoneNames] sortedArrayUsingSelector: @selector (localizedCaseInsensitiveCompare:)];
 }
 
 - (NSString *) userTimeZone