From 2039c4f6644b88aa993a078235be3d4621482ca0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 1 Sep 2010 20:36:05 +0000 Subject: [PATCH] Monotone-Parent: 148caf2ae66d2024b6008a2633e9145890921239 Monotone-Revision: 6bbe705e61e8fc6ef154a1903cb2e31282bbedfe Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-09-01T20:36:05 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/MailerUI/UIxMailView.m | 25 ++++++++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6334f103..8a7aa578c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-09-01 Wolfgang Sourdeau + * UI/MailerUI/UIxMailView.m (-sendMDNAction): new action for + sending an MDN from the confirmation dialog. + * UI/WebServerResources/MailerUI.js: (handleReturnReceipt): new function, crafted to be executed both from the main window and the popup mail window, where the value of the new "shouldAskReceipt" diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m index 6ce928ee4..7d812270d 100644 --- a/UI/MailerUI/UIxMailView.m +++ b/UI/MailerUI/UIxMailView.m @@ -542,25 +542,16 @@ static NSString *mailETag = nil; @" oneself.")]; else { - if ([self _messageHasDraftOrMDNSentFlag]) - response = [self responseWithStatus: 403 - andString: (@"The original message is" - @" flagged as a draft or an" - @" MDN has already been sent" - @" for it.")]; - else + action = [self _receiptAction]; + if ([action isEqualToString: @"ask"]) { - action = [self _receiptAction]; - if ([action isEqualToString: @"ask"]) - { - [self _sendEMailReceiptTo: email]; - response = [self responseWithStatus: 204]; - } - else - response = [self responseWithStatus: 403 - andString: (@"No notification header found in" - @" original message.")]; + [self _sendEMailReceiptTo: email]; + response = [self responseWithStatus: 204]; } + else + response = [self responseWithStatus: 403 + andString: (@"No notification header found in" + @" original message.")]; } } else