From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 19 Jul 2005 16:21:41 +0000 (+0000)
Subject: do not complain on missing drafts when deleting
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3322d746ae42cc5badaa66dd7ab19c1d15f117a2;p=scalable-opengroupware.org

do not complain on missing drafts when deleting


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

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index affdf4fc..6d7ff44d 100644
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-19  Helge Hess  <helge.hess@opengroupware.org>
 
+	* UIxMailEditor.m: do not complain on drafts not being found when the
+	  delete action is triggered (#1489) (v0.9.154)
+
 	* UIxMailAccountView.m: directly check the ACL of the Inbox to check
 	  permissions (the Inbox will return NO on isCreateAllowed when being
 	  used by altnamespace ...) (#1472) (v0.9.153)
diff --git a/SOGo/UI/MailerUI/UIxMailEditor.m b/SOGo/UI/MailerUI/UIxMailEditor.m
index f6caf20a..26af9774 100644
--- a/SOGo/UI/MailerUI/UIxMailEditor.m
+++ b/SOGo/UI/MailerUI/UIxMailEditor.m
@@ -399,8 +399,11 @@ static NSArray      *infoKeys            = nil;
   NSException *error;
   id page;
   
-  if ((error = [[self clientObject] delete]) != nil)
-    return error;
+  if ((error = [[self clientObject] delete]) != nil) {
+    /* Note: we ignore 404: those are drafts which were not yet saved */
+    if (![error httpStatus] == 404)
+      return error;
+  }
   
 #if 1
   page = [self pageWithName:@"UIxMailWindowCloser"];
diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index 12bf1aec..3a1e35de 100644
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=152
+SUBMINOR_VERSION:=154
 
 # v0.9.140 requires SoObjects/Mailer v0.9.100
 # v0.9.134 requires libSOGo          v0.9.41