From dcccee0cc2e283ebd0a644972f27c18073279dd8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 24 Jul 2007 19:59:49 +0000
Subject: [PATCH] Monotone-Parent: 6aa48a9460ff6651bbf7588fab4d7abc1370f223
 Monotone-Revision: c5cc88dd452d75edebb6730bdb60d21a0facec48

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-07-24T19:59:49
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  4 ++++
 UI/Contacts/UIxContactsListView.m             | 22 +++++--------------
 .../ContactsUI/UIxContactsListView.wox        |  8 +++----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83557def3..2cfff9547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactsListView.m ([-displayName]): removed
+	method.
+	([UIxContactsListView -defaultSortKey]): changed to "displayName".
+
 	* SoObjects/Contacts/SOGoContactLDAPFolder.m
 	([SOGoContactLDAPFolder
 	-lookupContactsWithFilter:filtersortBy:sortKeyordering:sortOrdering]):
diff --git a/UI/Contacts/UIxContactsListView.m b/UI/Contacts/UIxContactsListView.m
index 0ab859cad..940cbaa55 100644
--- a/UI/Contacts/UIxContactsListView.m
+++ b/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;
diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 7d4836e5c..79df8ddf7 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -35,11 +35,11 @@
             ondblclick="return onContactRowDblClick(event, this);"
             oncontextmenu="return onContactContextMenu(event, this);">
             <td><img rsrc:src="abcard.gif"
-		/><var:string value="displayName" const:escapeHTML="YES" /></td>
+		/><var:string value="currentContact.displayName" const:escapeHTML="YES" /></td>
             <td><var:string value="currentContact.mail"/></td>
-            <td><var:string value="currentContact.screenname"/></td>
-            <td><var:string value="currentContact.o"/></td>
-            <td><var:string value="currentContact.telephonenumber"/></td>
+            <td><var:string value="currentContact.screenName"/></td>
+            <td><var:string value="currentContact.org"/></td>
+            <td><var:string value="currentContact.phone"/></td>
           </tr>
         </var:foreach>
       </tbody>