Monotone-Parent: 8cb32e7332149028a582fdeaa02597ac6d6f9627

Monotone-Revision: e8c7cd4db91c71f68c83ba6f61ceb277e7b3e232

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-05-27T21:56:04
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,12 @@
 2010-05-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/WOContext+UIxMailer.m
+	(-mailEnvelopeAddressFormatter): declare result as
+	UIxEnvelopeAddressFormatter.
+
+	* UI/MailerUI/UIxMailListActions.m (-getHeadersAction):
+	"addressFormatter" really is a UIxEnvelopeAddressFormatter.
+
 	* UI/WebServerResources/UIxAttendeesEditor.js: (prepareAttendees):
 	automatically append a new attendee line when the window is loaded
 	and no attendee is present in the list yet.

UI/MailerUI/UIxMailFormatter.h

@@ -75,6 +75,8 @@
 
 - (id)initWithMaxLength:(unsigned int)_max generateFullEMail:(BOOL)_genFull;
 
+- (NSString *)stringForArray:(NSArray *)_addresses;
+
 @end
 
 #endif /* __Mailer_UIxMailFormatter_H__ */

UI/MailerUI/UIxMailListActions.m

@@ -60,6 +60,8 @@
 #import <UI/Common/WODirectAction+SOGo.h>
 
 #import "WOContext+UIxMailer.h"
+#import "UIxMailFormatter.h"
+
 #import "UIxMailListActions.h"
 
 @implementation UIxMailListActions
@@ -543,7 +545,6 @@
 
 - (id <WOActionResults>) getHeadersAction
 {
-  NSFormatter *addressFormatter;
   NSArray *uids, *to;
   NSDictionary *msgs;
   NSMutableArray *headers;
@@ -553,6 +554,7 @@
   SOGoMailFolder *mailFolder;
   WORequest *request;
   WOResponse *response;
+  UIxEnvelopeAddressFormatter *addressFormatter;
   
   request = [context request];
   

UI/MailerUI/WOContext+UIxMailer.h

@@ -32,10 +32,12 @@
 
 @class NSFormatter;
 
+@class UIxEnvelopeAddressFormatter;
+
 @interface WOContext (UIxMailer)
 
 - (NSFormatter *) mailDateFormatter;
-- (NSFormatter *) mailEnvelopeAddressFormatter;
+- (UIxEnvelopeAddressFormatter *) mailEnvelopeAddressFormatter;
 - (NSFormatter *) mailEnvelopeFullAddressFormatter;
 
 @end

UI/MailerUI/WOContext+UIxMailer.m

@@ -38,7 +38,7 @@
   return [[self activeUser] dateFormatterInContext: self];
 }
 
-- (NSFormatter *) mailEnvelopeAddressFormatter
+- (UIxEnvelopeAddressFormatter *) mailEnvelopeAddressFormatter
 {
   return [[[UIxEnvelopeAddressFormatter alloc] init] autorelease];
 }