amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 08:34:30 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 148caf2ae66d2024b6008a2633e9145890921239

Browse Source 
Monotone-Revision: 6bbe705e61e8fc6ef154a1903cb2e31282bbedfe

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-09-01T20:36:05
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-09-01 20:36:05 +00:00
parent 4d5c0ff6f4
commit 2039c4f664
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3
View File
@@ -1,5 +1,8 @@
2010-09-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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"
UI/MailerUI/UIxMailView.m
+8 -17
View File
@@ -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