From a6b42075101582b99333b307c830b764c5712f81 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 23 Oct 2008 15:55:56 +0000
Subject: [PATCH] Monotone-Parent: 3ad8d11f70ec6e6370751cd72269263405a290a1
 Monotone-Revision: 2e84cd33211e690f4a1d23f18f557220df113d36

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-10-23T15:55:56
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Mailer/SOGoMailFolder.h  | 8 ++++++++
 SoObjects/Mailer/SOGoMailFolder.m  | 8 ++++----
 UI/MailerUI/UIxMailEditor.m        | 2 +-
 UI/MailerUI/UIxMailFolderActions.m | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/SoObjects/Mailer/SOGoMailFolder.h b/SoObjects/Mailer/SOGoMailFolder.h
index eba89a3fa..cadffe066 100644
--- a/SoObjects/Mailer/SOGoMailFolder.h
+++ b/SoObjects/Mailer/SOGoMailFolder.h
@@ -36,6 +36,7 @@
 
 @class NSData, NSArray, NSException, NSMutableArray;
 @class NGImap4MailboxInfo;
+@class WOResponse;
 
 typedef enum {
   undefined = -1,
@@ -61,6 +62,13 @@ typedef enum {
 - (NSArray *) fetchUIDsMatchingQualifier: (id)_q sortOrdering: (id) _so;
 - (NSArray *) fetchUIDs: (NSArray *) _uids parts: (NSArray *) _parts;
 
+- (WOResponse *) copyUIDs: (NSArray *) uids
+		 toFolder: (NSString *) destinationFolder
+		inContext: (id) localContext;
+- (WOResponse *) moveUIDs: (NSArray *) uids
+		 toFolder: (NSString *) destinationFolder
+		inContext: (id) localContext;
+
 - (NSException *) postData: (NSData *) _data flags: (id) _flags;
 
 - (void) markForExpunge;
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index f4b3b4a8a..814c8c353 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -398,8 +398,8 @@ static NSString *spoolFolder = nil;
 }
 
 - (WOResponse *) copyUIDs: (NSArray *) uids
-          toFolder: (NSString *) destinationFolder
-          inContext: (id) localContext
+		 toFolder: (NSString *) destinationFolder
+		inContext: (id) localContext
 {
   NSEnumerator *folders;
   NSString *currentFolderName;
@@ -434,8 +434,8 @@ static NSString *spoolFolder = nil;
 }
 
 - (WOResponse *) moveUIDs: (NSArray *) uids
-          toFolder: (NSString *) destinationFolder
-          inContext: (id) localContext
+		 toFolder: (NSString *) destinationFolder
+		inContext: (id) localContext
 {
   id result;
   NGImap4Client *client;
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index a1effdb92..dd7ae83ae 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -109,7 +109,7 @@ static NSArray *infoKeys = nil;
 {
   if ((self = [super init]))
     {
-      [self setPriority: @"NORMAL"];
+      priority = @"NORMAL";
     }
   
   return self;
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index d1e757d7b..042170fee 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -196,7 +196,7 @@
   if ([value length] > 0)
     {
       uids = [value componentsSeparatedByString: @","];
-      response = [co deleteUIDs: uids  inContext: context];
+      response = (WOResponse *) [co deleteUIDs: uids  inContext: context];
       if (!response)
 	response = [self responseWith204];
     }