From c0990b7775c0ab654de3aff280634709339eae8a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 17 Aug 2007 02:30:28 +0000
Subject: [PATCH] Monotone-Parent: 276ecacf0cdba5ef4462aa2c4c44bfdcbb4a5d9e
 Monotone-Revision: c85409f639b55299e3ece362140e6725f6c43cbb

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-17T02:30:28
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           |  4 ++++
 UI/MailerUI/UIxMailAccountActions.m | 34 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index af08e5c42..62368b0c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailAccountActions.m ([UIxMailAccountActions
+	-composeAction]): new method replacing the one previously in
+	UIxMailMainFrame.
+
 	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
 	-imap4URLString]): removed overriden method (see below).
 
diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 6342e92f3..f7cb0be53 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -25,10 +25,16 @@
 #import <Foundation/NSEnumerator.h>
 
 #import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGImap4/NGImap4Connection.h>
 #import <SoObjects/Mailer/SOGoMailAccount.h>
+#import <SoObjects/Mailer/SOGoDraftObject.h>
+#import <SoObjects/Mailer/SOGoDraftsFolder.h>
 #import <SoObjects/SOGo/NSObject+Utilities.h>
+#import <SoObjects/SOGo/NSString+Utilities.h>
+
+#import "../Common/WODirectAction+SOGo.h"
 
 #import "UIxMailAccountActions.h"
 
@@ -111,4 +117,32 @@
   return response;
 }
 
+/* compose */
+
+- (WOResponse *) composeAction
+{
+  SOGoDraftsFolder *drafts;
+  SOGoDraftObject *newDraftMessage;
+  NSString *urlBase, *url;
+  NSString *mailTo;
+
+  drafts = [[self clientObject] draftsFolderInContext: context];
+  newDraftMessage = [drafts newDraft];
+
+  mailTo = [[self request] formValueForKey: @"mailto"];
+  if ([mailTo length] > 0)
+    {
+      [newDraftMessage setHeaders: [NSDictionary dictionaryWithObject: mailTo
+						 forKey: @"to"]];
+      [newDraftMessage storeInfo];
+    }
+
+  urlBase = [newDraftMessage baseURLInContext: context];
+  url = [urlBase composeURLWithAction: @"edit"
+		 parameters: nil
+		 andHash: NO];
+
+  return [self redirectToLocation: url];  
+}
+
 @end