Monotone-Parent: 600fef6ca341feacac6bb9e3012101ce7e14aae7

Monotone-Revision: 10b3eef04f57d98b8cd5811853bd18ee77bd52c7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-17T17:24:22
Monotone-Branch: ca.inverse.sogo

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.

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;

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"