diff options
author | 2014-10-21 15:46:19 -0600 | |
---|---|---|
committer | 2014-10-21 15:46:19 -0600 | |
commit | 53a1610d35f00301d933ea051b37b96fd30b0e93 (patch) | |
tree | bb2b4a0cdcac791365efc306feede072d347a9ba /src/objc/smtp | |
parent | f60b89b388389ee877e907819442b2e366238040 (diff) | |
parent | df800fed1079fb0b9f49681d7b1688c1d3b97539 (diff) |
Merge remote-tracking branch 'upstream/master' into NNTP-Cleanup
Diffstat (limited to 'src/objc/smtp')
-rw-r--r-- | src/objc/smtp/MCOSMTPSession.h | 10 | ||||
-rw-r--r-- | src/objc/smtp/MCOSMTPSession.mm | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/objc/smtp/MCOSMTPSession.h b/src/objc/smtp/MCOSMTPSession.h index 5c616244..286cd7c3 100644 --- a/src/objc/smtp/MCOSMTPSession.h +++ b/src/objc/smtp/MCOSMTPSession.h @@ -30,7 +30,7 @@ /** This is the hostname of the SMTP server to connect to. */ @property (nonatomic, copy) NSString * hostname; -/** This is the port of the POP3 server to connect to. */ +/** This is the port of the SMTP server to connect to. */ @property (nonatomic, assign) unsigned int port; /** This is the username of the account. */ @@ -95,7 +95,7 @@ Generate RFC 822 data using MCOMessageBuilder - MCOPOPOperation * op = [session sendOperationWithData:rfc822Data]; + MCOSMTPOperation * op = [session sendOperationWithData:rfc822Data]; [op start:^(NSError * error) { ... }]; @@ -109,7 +109,7 @@ Generate RFC 822 data using MCOMessageBuilder - MCOPOPOperation * op = [session sendOperationWithData:rfc822Data + MCOSMTPOperation * op = [session sendOperationWithData:rfc822Data from:[MCOAddress addressWithMailbox:@"hoa@etpan.org"] recipients:[NSArray arrayWithObject:[MCOAddress addressWithMailbox:@"laura@etpan.org"]]]; [op start:^(NSError * error) { @@ -123,7 +123,7 @@ /** Returns an operation that will check whether the SMTP account is valid. - MCOPOPOperation * op = [session checkAccountOperationWithFrom:[MCOAddress addressWithMailbox:@"hoa@etpan.org"]]; + MCOSMTPOperation * op = [session checkAccountOperationWithFrom:[MCOAddress addressWithMailbox:@"hoa@etpan.org"]]; [op start:^(NSError * error) { ... }]; @@ -133,7 +133,7 @@ /** Returns an operation that will perform a No-Op. - MCOPOPOperation * op = [session noopOperation]; + MCOSMTPOperation * op = [session noopOperation]; [op start:^(NSError * error) { ... }]; diff --git a/src/objc/smtp/MCOSMTPSession.mm b/src/objc/smtp/MCOSMTPSession.mm index 17dc5057..e0eb2a7d 100644 --- a/src/objc/smtp/MCOSMTPSession.mm +++ b/src/objc/smtp/MCOSMTPSession.mm @@ -67,6 +67,7 @@ private: - (void)dealloc { MC_SAFE_RELEASE(_loggerBridge); [_connectionLogger release]; + _session->setConnectionLogger(NULL); _session->release(); [super dealloc]; } |