From 1a12bec82232d7effecff740533fe5e47135273b Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 17 Sep 2007 17:24:22 +0000
Subject: [PATCH] Monotone-Parent: 600fef6ca341feacac6bb9e3012101ce7e14aae7
 Monotone-Revision: 10b3eef04f57d98b8cd5811853bd18ee77bd52c7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-17T17:24:22
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                 |  4 ++++
 UI/MailerUI/UIxMailListView.m             | 18 ++++++++++++++++++
 UI/Templates/MailerUI/UIxMailListView.wox |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 72ce783ca..0afb810bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+	-messageSubject]): new accessor method to work-around a problem
+	within SOPE where a subject could be returned as an NSData.
+
 	* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
 	-appendPersonalSources]): make sure the value of the "c_path4" of
 	the returned rows are not NSNull, otherwise, discard them.
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index ac5b71844..e004eae93 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -98,6 +98,24 @@ static int attachmentFlagSize = 8096;
   return [dateFormatter formattedDateAndTime: messageDate];
 }
 
+- (NSString *) messageSubject
+{
+  NSString *subject;
+  id envSubject;
+
+  envSubject = [[message valueForKey: @"envelope"] subject];
+  if ([envSubject isKindOfClass: [NSData class]])
+    {
+      subject = [[NSString alloc] initWithData: envSubject
+				  encoding: NSUTF8StringEncoding];
+      [subject autorelease];
+    }
+  else
+    subject = envSubject;
+
+  return subject;
+}
+
 - (BOOL) showToAddress 
 {
   NSString *ftype;
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index c5a3f0de0..f77b31986 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -62,7 +62,7 @@
 	  ><td
 	  var:class="messageSubjectCellStyleClass"
 	  var:id="msgDivID"
-	  ><var:string value="message.envelope.subject"
+	  ><var:string value="messageSubject"
 	    /></td
 
 	  ><td class="messageAddressColumn"