6 files changed, 20 insertions, 7 deletions
diff --git a/src/async/imap/MCIMAPAsyncConnection.cc b/src/async/imap/MCIMAPAsyncConnection.cc
index fc1935b7..1d07f79a 100644
--- a/src/async/imap/MCIMAPAsyncConnection.cc
+++ b/src/async/imap/MCIMAPAsyncConnection.cc
@@ -69,7 +69,7 @@ namespace mailcore {
         virtual ~IMAPConnectionLogger() {
         }
         
-        virtual void log(void * context, void * sender, ConnectionLogType logType, Data * buffer)
+        virtual void log(void * sender, ConnectionLogType logType, Data * buffer)
         {
             mConnection->logConnection(logType, buffer);
         }
diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.cc b/src/async/imap/MCIMAPFetchFoldersOperation.cc
index 07533e6e..41a95572 100644
--- a/src/async/imap/MCIMAPFetchFoldersOperation.cc
+++ b/src/async/imap/MCIMAPFetchFoldersOperation.cc
@@ -55,8 +55,8 @@ void IMAPFetchFoldersOperation::main()
     
     char * delimiterData = (char *) malloc(1);
     * delimiterData = session()->session()->delimiter();
-    session()->performMethodOnMainThread((Object::Method) &IMAPFetchFoldersOperation::setDelimiterDataOnMainThread,
-                                         delimiterData);
+    performMethodOnMainThread((Object::Method) &IMAPFetchFoldersOperation::setDelimiterDataOnMainThread,
+                              delimiterData, true);
 }
 
 void IMAPFetchFoldersOperation::setDelimiterDataOnMainThread(char * delimiterData)
diff --git a/src/async/imap/MCIMAPIdleOperation.cc b/src/async/imap/MCIMAPIdleOperation.cc
index 42c58f90..8b48b77c 100644
--- a/src/async/imap/MCIMAPIdleOperation.cc
+++ b/src/async/imap/MCIMAPIdleOperation.cc
@@ -47,7 +47,7 @@ void IMAPIdleOperation::unprepare()
 
 void IMAPIdleOperation::main()
 {
-    performMethodOnMainThread((Object::Method) &IMAPIdleOperation::prepare, NULL);
+    performMethodOnMainThread((Object::Method) &IMAPIdleOperation::prepare, NULL, true);
     
     if (!mSetupSuccess) {
         return;
@@ -57,7 +57,7 @@ void IMAPIdleOperation::main()
     session()->session()->idle(folder(), mLastKnownUid, &error);
     setError(error);
     
-    performMethodOnMainThread((Object::Method) &IMAPIdleOperation::unprepare, NULL);
+    performMethodOnMainThread((Object::Method) &IMAPIdleOperation::unprepare, NULL, true);
 }
 
 void IMAPIdleOperation::interruptIdle()
diff --git a/src/async/pop/MCPOPAsyncSession.cc b/src/async/pop/MCPOPAsyncSession.cc
index 342b0f5e..bfabc847 100644
--- a/src/async/pop/MCPOPAsyncSession.cc
+++ b/src/async/pop/MCPOPAsyncSession.cc
@@ -50,7 +50,7 @@ namespace mailcore {
         virtual ~POPConnectionLogger() {
         }
         
-        virtual void log(void * context, void * sender, ConnectionLogType logType, Data * buffer)
+        virtual void log(void * sender, ConnectionLogType logType, Data * buffer)
         {
             mSession->logConnection(logType, buffer);
         }
diff --git a/src/async/smtp/MCSMTPAsyncSession.cc b/src/async/smtp/MCSMTPAsyncSession.cc
index fafc2e82..f670894a 100644
--- a/src/async/smtp/MCSMTPAsyncSession.cc
+++ b/src/async/smtp/MCSMTPAsyncSession.cc
@@ -41,7 +41,7 @@ namespace mailcore {
         virtual ~SMTPConnectionLogger() {
         }
         
-        virtual void log(void * context, void * sender, ConnectionLogType logType, Data * buffer)
+        virtual void log(void * sender, ConnectionLogType logType, Data * buffer)
         {
             mSession->logConnection(logType, buffer);
         }
@@ -113,6 +113,16 @@ String * SMTPAsyncSession::password()
     return mSession->password();
 }
 
+void SMTPAsyncSession::setOAuth2Token(String * token)
+{
+    mSession->setOAuth2Token(token);
+}
+
+String * SMTPAsyncSession::OAuth2Token()
+{
+    return mSession->OAuth2Token();
+}
+
 void SMTPAsyncSession::setAuthType(AuthType authType)
 {
     mSession->setAuthType(authType);
diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h
index 9fa6dbdf..bbb81737 100644
--- a/src/async/smtp/MCSMTPAsyncSession.h
+++ b/src/async/smtp/MCSMTPAsyncSession.h
@@ -33,6 +33,9 @@ namespace mailcore {
 		virtual void setPassword(String * password);
 		virtual String * password();
 
+        virtual void setOAuth2Token(String * token);
+        virtual String * OAuth2Token();
+        
 		virtual void setAuthType(AuthType authType);
 		virtual AuthType authType();