3 files changed, 13 insertions, 2 deletions
diff --git a/src/core/basetypes/MCOperationQueue.cc b/src/core/basetypes/MCOperationQueue.cc
index 73b62f19..3619530b 100644
--- a/src/core/basetypes/MCOperationQueue.cc
+++ b/src/core/basetypes/MCOperationQueue.cc
@@ -49,6 +49,16 @@ void OperationQueue::addOperation(Operation * op)
     startThread();
 }
 
+void OperationQueue::cancelAllOperations()
+{
+    pthread_mutex_lock(&mLock);
+    for (unsigned int i = 0 ; i < mOperations->count() ; i ++) {
+        Operation * op = (Operation *) mOperations->objectAtIndex(i);
+        op->cancel();
+    }
+    pthread_mutex_unlock(&mLock);
+}
+
 void OperationQueue::runOperationsOnThread(OperationQueue * queue)
 {
     queue->runOperations();
@@ -115,7 +125,7 @@ void OperationQueue::runOperations()
         
         if (needsCheckRunning) {
             retain(); // (1)
-            MCLog("check running %p", this);
+            //MCLog("check running %p", this);
 #if __APPLE__
             performMethodOnDispatchQueue((Object::Method) &OperationQueue::checkRunningOnMainThread, this, mDispatchQueue);
 #else
diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h
index 202dec40..b5f29143 100644
--- a/src/core/basetypes/MCOperationQueue.h
+++ b/src/core/basetypes/MCOperationQueue.h
@@ -21,6 +21,7 @@ namespace mailcore {
         virtual ~OperationQueue();
         
         virtual void addOperation(Operation * op);
+        virtual void cancelAllOperations();
         
         virtual unsigned int count();
         
diff --git a/src/core/basetypes/MCSet.cc b/src/core/basetypes/MCSet.cc
index ad615388..ceccbdcc 100644
--- a/src/core/basetypes/MCSet.cc
+++ b/src/core/basetypes/MCSet.cc
@@ -45,7 +45,7 @@ Set * Set::setWithArray(Array * objects)
 String * Set::description()
 {
     String * result = String::string();
-    result->appendUTF8Format("<%s:%p ", className(), this);
+    result->appendUTF8Format("<%s:%p ", MCUTF8(className()), this);
     result->appendString(mHash->allKeys()->description());
     result->appendUTF8Characters(">");
     return result;