Merge branch 'master' into icu-ucsdet

2 files changed, 8 insertions, 3 deletions

diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h
index 6e7e2431..1f567a52 100644
--- a/src/core/abstract/MCAbstractMessage.h
+++ b/src/core/abstract/MCAbstractMessage.h
@@ -16,14 +16,21 @@ namespace mailcore {
         AbstractMessage();
         virtual ~AbstractMessage();
         
+        /** Header of the message. */
         virtual MessageHeader * header();
+        /** Set a header of the message. */
         virtual void setHeader(MessageHeader * header);
         
+        /** Returns a part matching the given contentID. */
         virtual AbstractPart * partForContentID(String * contentID);
+        /** Returns a part matching the given uniqueID */
         virtual AbstractPart * partForUniqueID(String * uniqueID);
         
+        /** Returns the list of attachments, not part of the content of the message. */
         virtual Array * /* AbstractPart */ attachments();
+        /** Returns the list of attachments that are shown inline in the content of the message. */
         virtual Array * /* AbstractPart */ htmlInlineAttachments();
+        /** Returns the list of the text parts required to render the message properly. */
         virtual Array * /* AbstractPart */ requiredPartsForRendering();
         
     public: //subclass behavior
diff --git a/src/core/basetypes/MCObject.cpp b/src/core/basetypes/MCObject.cpp
index 43137f78..3034c791 100644
--- a/src/core/basetypes/MCObject.cpp
+++ b/src/core/basetypes/MCObject.cpp
@@ -313,14 +313,12 @@ void Object::performMethodOnDispatchQueue(Method method, void * context, void *
         dispatch_retain((dispatch_queue_t) targetDispatchQueue);
         dispatch_sync((dispatch_queue_t) targetDispatchQueue, ^{
             (this->*method)(context);
-            dispatch_release((dispatch_queue_t) targetDispatchQueue);
         });
+        dispatch_release((dispatch_queue_t) targetDispatchQueue);
     }
     else {
-        dispatch_retain((dispatch_queue_t) targetDispatchQueue);
         dispatch_async((dispatch_queue_t) targetDispatchQueue, ^{
             (this->*method)(context);
-            dispatch_release((dispatch_queue_t) targetDispatchQueue);
         });
     }
 }