See ChangeLog

Monotone-Parent: f843025ba847f98dd8c231cef0b6ea7e430dc9b6
Monotone-Revision: d4476114c133c77a0b6b0b596165243704a68fb6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-13T18:55:44
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailFolder.h

@@ -53,7 +53,7 @@
 - (NSArray *) toManyRelationshipKeys;
 
 - (NSException *) deleteUIDs: (NSArray *) uids
-	      useTrashFolder: (BOOL) withTrash
+	      useTrashFolder: (BOOL *) withTrash
 		   inContext: (id) context;
 - (WOResponse *) archiveUIDs: (NSArray *) uids
               inArchiveNamed: (NSString *) archiveName

SoObjects/Mailer/SOGoMailFolder.m

@@ -265,8 +265,9 @@ static NSString *defaultUserID =  @"anyone";
 }
 
 /* messages */
+
 - (NSException *) deleteUIDs: (NSArray *) uids
-	      useTrashFolder: (BOOL) withTrash
+	      useTrashFolder: (BOOL *) withTrash
 		   inContext: (id) localContext
 {
   SOGoMailFolder *trashFolder;
@@ -279,7 +280,7 @@ static NSString *defaultUserID =  @"anyone";
   client = nil;
   trashFolder = nil;
   b = YES;
-  if (withTrash)
+  if (*withTrash)
     {
       trashFolder = [[self mailAccountFolder] trashFolderInContext: localContext];
       b = NO;
@@ -298,7 +299,7 @@ static NSString *defaultUserID =  @"anyone";
 	      // do not, of course, try to move messages to the Trash folder.
 	      if ([folderName isEqualToString: [self relativeImap4Name]])
                 {
-                  withTrash = NO;
+                  *withTrash = NO;
                 }
               else
                 {
@@ -335,7 +336,7 @@ static NSString *defaultUserID =  @"anyone";
                           objectForKey: @"result"];
       if ([result boolValue])
 	{
-          if (withTrash)
+          if (*withTrash)
             {
               [self markForExpunge];
               if (trashFolder)