Monotone-Parent: a4b72920f072cccd72e189b05519b57436eb9471

Monotone-Revision: 71372fb23c7baec6da2c9bd612ed5a65db22f208

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-21T14:35:58
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailFolder.m

@@ -19,6 +19,7 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSURL.h>

SoObjects/Mailer/SOGoMailForward.m

@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSString+misc.h>
 
@@ -89,7 +91,8 @@
   NSString *rc;
 
   if (htmlComposition)
-    rc = [[[sourceMail mailHeaders] objectForKey: @"from"] stringByEscapingHTMLString];
+    rc = [[[sourceMail mailHeaders] objectForKey: @"from"]
+           stringByEscapingHTMLString];
   else
     rc = [[sourceMail mailHeaders] objectForKey: @"from"];
 

SoObjects/Mailer/SOGoMailObject.m

@@ -30,6 +30,7 @@
 
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NGHashMap.h>

SoObjects/Mailer/SOGoSieveConverter.m

@@ -429,6 +429,8 @@ static NSDictionary *methodRequirements = nil;
     *flag, *mailbox;
   SOGoDomainDefaults *dd;
 
+  sieveAction = nil;
+
   method = [action objectForKey: @"method"];
   if (method)
     {
@@ -484,10 +486,7 @@ static NSDictionary *methodRequirements = nil;
         }
     }
   else
-    {
-      scriptError = @"Action missing 'method' parameter";
-      sieveAction = nil;
-    }
+    scriptError = @"Action missing 'method' parameter";
 
   return sieveAction;
 }