From 67d32dff9a4e08f1881199719cc459fca5c29cc4 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 24 Mar 2011 14:43:52 +0000
Subject: [PATCH] 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       | 9 ++++-----
 UI/PreferencesUI/UIxPreferences.m | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/SOPE/NGCards/iCalTimeZone.m b/SOPE/NGCards/iCalTimeZone.m
index 310983c94..510db0759 100644
--- a/SOPE/NGCards/iCalTimeZone.m
+++ b/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
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 8b47046a5..bb087356e 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -153,7 +153,7 @@
 
 - (NSArray *) timeZonesList
 {
-  return [iCalTimeZone knownTimeZoneNames];
+  return [[iCalTimeZone knownTimeZoneNames] sortedArrayUsingSelector: @selector (localizedCaseInsensitiveCompare:)];
 }
 
 - (NSString *) userTimeZone