Monotone-Parent: 6aa48a9460ff6651bbf7588fab4d7abc1370f223

Monotone-Revision: c5cc88dd452d75edebb6730bdb60d21a0facec48

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-07-24T19:59:49
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactsListView.m

@@ -92,18 +92,7 @@
 
 - (NSString *) defaultSortKey
 {
-  return @"fn";
-}
-
-- (NSString *) displayName
-{
-  NSString *displayName;
-
-  displayName = [currentContact objectForKey: @"displayName"];
-  if (!(displayName && [displayName length] > 0))
-    displayName = [currentContact objectForKey: @"c_cn"];
-
-  return displayName;
+  return @"displayName";
 }
 
 - (NSString *) sortKey
@@ -137,10 +126,11 @@
       else
 	valueText = nil;
 
-      ASSIGN (contactInfos,
-	      [folder lookupContactsWithFilter: valueText
-		      sortBy: [self sortKey]
-		      ordering: ordering]);
+      [contactInfos release];
+      contactInfos = [folder lookupContactsWithFilter: valueText
+			     sortBy: [self sortKey]
+			     ordering: ordering];
+      [contactInfos retain];
     }
 
   return contactInfos;