From 9b77c3788f4ef98229d470c7402f09fbce28d9dc Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 21 Oct 2008 16:20:07 +0000
Subject: [PATCH 1/2] Monotone-Parent: 2dcd3767ec243afcd8e444a801259ca2507bd02e
 Monotone-Revision: 15b348711217f6686deaa8f88ae89e58a11f436c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-10-21T16:20:07
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           | 6 ++++++
 UI/Contacts/UIxContactFoldersView.m | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13071ad0a..76b94c163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
+	-contactSearchAction]): fixed typing of "contacts", which actually
+	is an NSArray.
+
 2008-10-17  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Common/UIxPageFrame.m ([NSString userLanguage]): returns the
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index 54128163d..1f0c9f810 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -141,7 +141,7 @@ withSearchOn: (NSString *) contact
   return email;
 }
 
-- (NSDictionary *) _responseForResults: (NSArray *) results
+- (NSArray *) _responseForResults: (NSArray *) results
 {
   NSEnumerator *contacts;
   NSString *email, *infoKey, *info;
@@ -255,7 +255,8 @@ withSearchOn: (NSString *) contact
 
 - (id <WOActionResults>) contactSearchAction
 {
-  NSDictionary *contacts, *data;
+  NSDictionary *data;
+  NSArray *contacts;
   NSString *searchText;
   id <WOActionResults> result;
   LDAPUserManager *um;

From 6d1aa93998f57683eff07fcaf284fcba79756858 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 21 Oct 2008 16:26:07 +0000
Subject: [PATCH 2/2] Monotone-Parent: 15b348711217f6686deaa8f88ae89e58a11f436c
 Monotone-Revision: add28d9d67adcd6d59ae80bdec669e2794e55fc3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-10-21T16:26:07
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/MailerUI/UIxMailListView.wox | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index d52d8a86a..40c6a9451 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -11,14 +11,14 @@
       ><var:foreach list="columnsDisplayOrder" item="currentColumn">
         <td var:class="currentColumn.headerClass" var:id="currentColumn.headerId">
           <var:if condition="currentColumn.value" const:value="Invisible">
-            <img rsrc:src="empty.gif" width="100%" height="100%" label:title="void" />
+            <img rsrc:src="empty.gif" width="100%" height="100%" const:title="" />
           </var:if>
           <var:if condition="currentColumn.value" const:value="Attachment">
-            <img rsrc:src="title_attachment_14x14.png" var:title="currentColumn.value" width="14"
+            <img rsrc:src="title_attachment_14x14.png" label:title="$currentColumn.value" width="14"
           	  height="14"/>
           </var:if>
           <var:if condition="currentColumn.value" const:value="Unread">
-            <img rsrc:src="title_read_14x14.png" var:title="currentColumn.value" />
+            <img rsrc:src="title_read_14x14.png" label:title="$currentColumn.value" />
           </var:if>
           <var:if condition="currentColumn.value" const:value="Invisible" const:negate="YES">
             <var:if condition="currentColumn.value" const:value="Attachment" const:negate="YES">