Comment out sendMail method in SOGoDraftObject and replace its sole known usage by sendMailAndCopyToSent.

In a 2011-09-26 commit (in Changelog.old), I understand the author wanted to
phase sendMail out and replace it by sendMailAndCopyToSent.  Since there are
compilation warnings related to sendMail, removing the sendMail method and
replacing the sole call to it seemed like the cleanest way.
pull/201/head
Patrice Levesque 2016-02-17 16:30:38 -05:00
parent fc9dde885b
commit a813e38897
3 changed files with 5 additions and 2 deletions

View File

@ -114,7 +114,7 @@
- (NSArray *) allBareRecipients;
- (NSException *) delete;
- (NSException *) sendMail;
/* - (NSException *) sendMail; */
- (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent; /* default: YES */
- (NSException *) save;

View File

@ -69,6 +69,7 @@
#import "SOGoDraftObject.h"
static NSString *contentTypeValue = @"text/plain; charset=utf-8";
static NSString *htmlContentTypeValue = @"text/html; charset=utf-8";
static NSString *headerKeys[] = {@"subject", @"to", @"cc", @"bcc",
@ -1782,6 +1783,7 @@ static NSString *userAgent = nil;
//
//
//
/*
- (NSException *) sendMail
{
SOGoUserDefaults *ud;
@ -1843,6 +1845,7 @@ static NSString *userAgent = nil;
}
return [self sendMailAndCopyToSent: YES];
}
*/
//
//

View File

@ -869,7 +869,7 @@ static NSArray *infoKeys = nil;
{
error = [self validateForSend];
if (!error)
error = [co sendMail];
error = [co sendMailAndCopyToSent: false];
else
error = [self failedToSaveFormResponse: [error reason]];
}