diff options
| author |  CodaFi <devteam.codafi@gmail.com> | 2013-06-27 22:54:06 -0600 |
|---|---|---|
| committer | CodaFi <devteam.codafi@gmail.com> | 2013-06-27 22:54:06 -0600 |
| commit | 3b5c047b332f682887ffe8130e03e6dab714ed08 (patch) | |
| tree | 599d37610f58708a53872d62890657317c146b6c /src | |
| parent | 80561e65fd1117497e034a6fe5cb8f6dc7c26487 (diff) | |
| parent | 29bc4a2eac587c83f1de1ecf5ee5dc2299452966 (diff) | |
Merge remote-tracking branch 'upstream/master' into Copy
Diffstat (limited to 'src')
| -rw-r--r-- | src/async/imap/MCIMAPAsyncConnection.cc | 4 | ||||
| -rw-r--r-- | src/async/pop/MCPOPAsyncSession.cc | 4 | ||||
| -rw-r--r-- | src/async/smtp/MCSMTPAsyncSession.cc | 4 | ||||
| -rw-r--r-- | src/core/basetypes/MCHTMLCleaner.cc | 1 | ||||
| -rw-r--r-- | src/core/basetypes/MCString.cc | 4 |
5 files changed, 10 insertions, 7 deletions
diff --git a/src/async/imap/MCIMAPAsyncConnection.cc b/src/async/imap/MCIMAPAsyncConnection.cc index 232b343a..a4244ed3 100644 --- a/src/async/imap/MCIMAPAsyncConnection.cc +++ b/src/async/imap/MCIMAPAsyncConnection.cc @@ -47,11 +47,11 @@ namespace mailcore { virtual ~IMAPOperationQueueCallback() { } - virtual void queueStartRunning() { + virtual void queueStartRunning(OperationQueue * queue) { mConnection->queueStartRunning(); } - virtual void queueStoppedRunning() { + virtual void queueStoppedRunning(OperationQueue * queue) { mConnection->tryAutomaticDisconnect(); mConnection->queueStoppedRunning(); } diff --git a/src/async/pop/MCPOPAsyncSession.cc b/src/async/pop/MCPOPAsyncSession.cc index 5a49e022..342b0f5e 100644 --- a/src/async/pop/MCPOPAsyncSession.cc +++ b/src/async/pop/MCPOPAsyncSession.cc @@ -29,11 +29,11 @@ namespace mailcore { virtual ~POPOperationQueueCallback() { } - virtual void queueStartRunning() { + virtual void queueStartRunning(OperationQueue * queue) { mSession->retain(); } - virtual void queueStoppedRunning() { + virtual void queueStoppedRunning(OperationQueue * queue) { mSession->release(); } diff --git a/src/async/smtp/MCSMTPAsyncSession.cc b/src/async/smtp/MCSMTPAsyncSession.cc index d680abee..fafc2e82 100644 --- a/src/async/smtp/MCSMTPAsyncSession.cc +++ b/src/async/smtp/MCSMTPAsyncSession.cc @@ -19,11 +19,11 @@ namespace mailcore { virtual ~SMTPOperationQueueCallback() { } - virtual void queueStartRunning() { + virtual void queueStartRunning(OperationQueue * queue) { mSession->retain(); } - virtual void queueStoppedRunning() { + virtual void queueStoppedRunning(OperationQueue * queue) { mSession->tryAutomaticDisconnect(); mSession->release(); } diff --git a/src/core/basetypes/MCHTMLCleaner.cc b/src/core/basetypes/MCHTMLCleaner.cc index 12f1371e..7d45d3f2 100644 --- a/src/core/basetypes/MCHTMLCleaner.cc +++ b/src/core/basetypes/MCHTMLCleaner.cc @@ -68,6 +68,7 @@ String * HTMLCleaner::cleanHTML(String * input) String * result = String::stringWithUTF8Characters((const char *) output.bp); + tidyBufFree(&docbuf); tidyBufFree(&output); tidyBufFree(&errbuf); tidyRelease(tdoc); diff --git a/src/core/basetypes/MCString.cc b/src/core/basetypes/MCString.cc index 832ffac2..2c0311dd 100644 --- a/src/core/basetypes/MCString.cc +++ b/src/core/basetypes/MCString.cc @@ -781,7 +781,9 @@ String * String::stringWithVUTF8Format(const char * format, va_list ap) { char * result; vasprintf(&result, format, ap); - return stringWithUTF8Characters(result); + String * str = stringWithUTF8Characters(result); + free(result); + return str; } String * String::stringWithUTF8Characters(const char * UTF8Characters) |