From d81084a03115130f9ea3c3fd1ff0f422106d403f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 27 May 2010 21:56:04 +0000
Subject: [PATCH] Monotone-Parent: 8cb32e7332149028a582fdeaa02597ac6d6f9627
 Monotone-Revision: e8c7cd4db91c71f68c83ba6f61ceb277e7b3e232

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-05-27T21:56:04
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                         | 7 +++++++
 UI/MailerUI/UIxMailFormatter.h    | 2 ++
 UI/MailerUI/UIxMailListActions.m  | 4 +++-
 UI/MailerUI/WOContext+UIxMailer.h | 4 +++-
 UI/MailerUI/WOContext+UIxMailer.m | 2 +-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02ddef494..2951d46b9 100644
--- a/ChangeLog
+++ b/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.
diff --git a/UI/MailerUI/UIxMailFormatter.h b/UI/MailerUI/UIxMailFormatter.h
index 847cda672..3b29ed261 100644
--- a/UI/MailerUI/UIxMailFormatter.h
+++ b/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__ */
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index bfa6914cb..e24fa51ab 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/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];
   
diff --git a/UI/MailerUI/WOContext+UIxMailer.h b/UI/MailerUI/WOContext+UIxMailer.h
index 281a693d9..344d7aff1 100644
--- a/UI/MailerUI/WOContext+UIxMailer.h
+++ b/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
diff --git a/UI/MailerUI/WOContext+UIxMailer.m b/UI/MailerUI/WOContext+UIxMailer.m
index 716d14b9d..c7ef73243 100644
--- a/UI/MailerUI/WOContext+UIxMailer.m
+++ b/UI/MailerUI/WOContext+UIxMailer.m
@@ -38,7 +38,7 @@
   return [[self activeUser] dateFormatterInContext: self];
 }
 
-- (NSFormatter *) mailEnvelopeAddressFormatter
+- (UIxEnvelopeAddressFormatter *) mailEnvelopeAddressFormatter
 {
   return [[[UIxEnvelopeAddressFormatter alloc] init] autorelease];
 }