fixed mail deletion

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@442 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 4ea1dc22091ef6c5a1d9e9da3eb38b462da731f4..743d3e079bcfefd999111bd21a6f13eabb0a6f89 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-29  Helge Hess  <helge.hess@skyrix.com>
+
+       * UIxMailEditor.m: reenabled deletion of temporary mail files (v0.9.57)
+
 2004-10-28  Helge Hess  <helge.hess@skyrix.com>
 
        * product.plist: fixed getMail for drafts folder (v0.9.56)

diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m
index 6bae44aa1a3f7c45484c636a8fac800f058a5fc0..3de13625f8248dda717e901cd9240c8705164435 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditor.m
+++ b/SOGo/UI/Mailer/UIxMailEditor.m
@@ -48,6 +48,8 @@
 
 @implementation UIxMailEditor
 
+static BOOL keepMailTmpFile    = NO;
+static BOOL keepDraftAfterSend = NO;
 static NSArray *infoKeys = nil;
 
 + (void)initialize {
@@ -55,6 +57,9 @@ static NSArray *infoKeys = nil;
                                @"subject", @"text", @"to", @"cc", @"bcc", 
                                @"from", @"replyTo",
                              nil];
+
+  if (keepMailTmpFile)
+    NSLog(@"WARNING: keeping mail files.");
 }
 
 - (void)dealloc {
@@ -213,14 +218,19 @@ static NSArray *infoKeys = nil;
   /* finally store in Sent */
   
   [self logWithFormat:@"TODO: store mail in Sent folder: %@", mailPath];
-#if 0
-  [[NSFileManager defaultManager] removeFileAtPath:mailPath handler:nil];
-#endif
+  if (keepMailTmpFile)
+    [self logWithFormat:@"WARNING: keeping mail file: '%@'", mailPath];
+  else
+    [[NSFileManager defaultManager] removeFileAtPath:mailPath handler:nil];
   mailPath = nil;
   
   /* delete draft */
   
-  if ((error = [[self clientObject] delete]) != nil)
+  if (keepDraftAfterSend) {
+    [self logWithFormat:@"WARNING: keeping draft object: '%@'", 
+           [self clientObject]];
+  }
+  else if ((error = [[self clientObject] delete]) != nil)
     return error;
   
   // if everything is ok, close the window (send a JS closing the Window)

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 61d114270ba174b707f8f74b42900a6e32f36ecc..120c434f6b15cf8b768e3d778837660059cc0d0a 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=56
+SUBMINOR_VERSION:=57
 
 # v0.9.50 requires NGMime   v4.3.190
 # v0.9.43 requires NGObjWeb v4.3.73