1 files changed, 68 insertions, 17 deletions
diff --git a/src/objc/abstract/MCOAbstractMessageRendererCallback.mm b/src/objc/abstract/MCOAbstractMessageRendererCallback.mm
index 392f0747..8c07a15b 100644
--- a/src/objc/abstract/MCOAbstractMessageRendererCallback.mm
+++ b/src/objc/abstract/MCOAbstractMessageRendererCallback.mm
@@ -24,7 +24,10 @@ MCOAbstractMessageRendererCallback::MCOAbstractMessageRendererCallback(MCOAbstra
 
 bool MCOAbstractMessageRendererCallback::canPreviewPart(AbstractPart * part)
 {
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:canPreviewPart:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:canPreviewPart:)]) {
+        return [mRendererDelegate abstractMessage:mMessage canPreviewPart:MCO_TO_OBJC(part)];
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:canPreviewPart:)]) {
         return [mRendererDelegate MCOAbstractMessage:mMessage canPreviewPart:MCO_TO_OBJC(part)];
     }
     return HTMLRendererTemplateCallback::canPreviewPart(part);
@@ -32,7 +35,10 @@ bool MCOAbstractMessageRendererCallback::canPreviewPart(AbstractPart * part)
 
 bool MCOAbstractMessageRendererCallback::shouldShowPart(AbstractPart * part)
 {
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:shouldShowPart:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:shouldShowPart:)]) {
+        return [mRendererDelegate abstractMessage:mMessage shouldShowPart:MCO_TO_OBJC(part)];
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:shouldShowPart:)]) {
         return [mRendererDelegate MCOAbstractMessage:mMessage shouldShowPart:MCO_TO_OBJC(part)];
     }
     return HTMLRendererTemplateCallback::shouldShowPart(part);
@@ -41,7 +47,10 @@ bool MCOAbstractMessageRendererCallback::shouldShowPart(AbstractPart * part)
 HashMap * MCOAbstractMessageRendererCallback::templateValuesForHeader(MessageHeader * header)
 {
     HashMap * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForHeader:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateValuesForHeader:)]) {
+        result = MCO_FROM_OBJC(HashMap, [mRendererDelegate abstractMessage:mMessage templateValuesForHeader:MCO_TO_OBJC(header)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForHeader:)]) {
         result = MCO_FROM_OBJC(HashMap, [mRendererDelegate MCOAbstractMessage:mMessage templateValuesForHeader:MCO_TO_OBJC(header)]);
     }
     if (result == NULL) {
@@ -53,7 +62,10 @@ HashMap * MCOAbstractMessageRendererCallback::templateValuesForHeader(MessageHea
 HashMap * MCOAbstractMessageRendererCallback::templateValuesForPart(AbstractPart * part)
 {
     HashMap * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForPart:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateValuesForPart:)]) {
+        result = MCO_FROM_OBJC(HashMap, [mRendererDelegate abstractMessage:mMessage templateValuesForPart:MCO_TO_OBJC(part)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateValuesForPart:)]) {
         result = MCO_FROM_OBJC(HashMap, [mRendererDelegate MCOAbstractMessage:mMessage templateValuesForPart:MCO_TO_OBJC(part)]);
     }
     if (result == NULL) {
@@ -65,7 +77,10 @@ HashMap * MCOAbstractMessageRendererCallback::templateValuesForPart(AbstractPart
 String * MCOAbstractMessageRendererCallback::templateForMainHeader(MessageHeader * header)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForMainHeader:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForMainHeader:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForMainHeader:MCO_TO_OBJC(header)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForMainHeader:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForMainHeader:MCO_TO_OBJC(header)]);
     }
     if (result == NULL) {
@@ -77,7 +92,10 @@ String * MCOAbstractMessageRendererCallback::templateForMainHeader(MessageHeader
 String * MCOAbstractMessageRendererCallback::templateForImage(AbstractPart * part)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForImage:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForImage:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForImage:MCO_TO_OBJC(part)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForImage:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForImage:MCO_TO_OBJC(part)]);
     }
     if (result == NULL) {
@@ -89,7 +107,10 @@ String * MCOAbstractMessageRendererCallback::templateForImage(AbstractPart * par
 String * MCOAbstractMessageRendererCallback::templateForAttachment(AbstractPart * part)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForAttachment:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForAttachment:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForAttachment:MCO_TO_OBJC(part)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForAttachment:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForAttachment:MCO_TO_OBJC(part)]);
     }
     if (result == NULL) {
@@ -101,7 +122,10 @@ String * MCOAbstractMessageRendererCallback::templateForAttachment(AbstractPart
 String * MCOAbstractMessageRendererCallback::templateForMessage(AbstractMessage * message)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForMessage:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage_templateForMessage:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage_templateForMessage:mMessage]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForMessage:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage_templateForMessage:mMessage]);
     }
     if (result == NULL) {
@@ -113,7 +137,10 @@ String * MCOAbstractMessageRendererCallback::templateForMessage(AbstractMessage
 String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessage(AbstractMessagePart * part)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessage:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForEmbeddedMessage:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForEmbeddedMessage:MCO_TO_OBJC(part)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessage:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForEmbeddedMessage:MCO_TO_OBJC(part)]);
     }
     if (result == NULL) {
@@ -125,7 +152,10 @@ String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessage(Abstract
 String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessageHeader(MessageHeader * header)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessageHeader:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:templateForEmbeddedMessageHeader:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage templateForEmbeddedMessageHeader:MCO_TO_OBJC(header)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:templateForEmbeddedMessageHeader:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage templateForEmbeddedMessageHeader:MCO_TO_OBJC(header)]);
     }
     if (result == NULL) {
@@ -137,7 +167,10 @@ String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessageHeader(Me
 String * MCOAbstractMessageRendererCallback::templateForAttachmentSeparator()
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForAttachmentSeparator:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage_templateForAttachmentSeparator:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage_templateForAttachmentSeparator:mMessage]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForAttachmentSeparator:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage_templateForAttachmentSeparator:mMessage]);
     }
     if (result == NULL) {
@@ -149,7 +182,10 @@ String * MCOAbstractMessageRendererCallback::templateForAttachmentSeparator()
 String * MCOAbstractMessageRendererCallback::cleanHTMLForPart(String * html)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:cleanHTMLForPart:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:cleanHTMLForPart:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage cleanHTMLForPart:MCO_TO_OBJC(html)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:cleanHTMLForPart:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage cleanHTMLForPart:MCO_TO_OBJC(html)]);
     }
     if (result == NULL) {
@@ -161,7 +197,10 @@ String * MCOAbstractMessageRendererCallback::cleanHTMLForPart(String * html)
 String * MCOAbstractMessageRendererCallback::filterHTMLForPart(String * html)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForPart:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:filterHTMLForPart:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage filterHTMLForPart:MCO_TO_OBJC(html)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForPart:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage filterHTMLForPart:MCO_TO_OBJC(html)]);
     }
     if (result == NULL) {
@@ -173,7 +212,10 @@ String * MCOAbstractMessageRendererCallback::filterHTMLForPart(String * html)
 String * MCOAbstractMessageRendererCallback::filterHTMLForMessage(String * html)
 {
     String * result = NULL;
-    if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForMessage:)]) {
+    if ([mRendererDelegate respondsToSelector:@selector(abstractMessage:filterHTMLForMessage:)]) {
+        result = MCO_FROM_OBJC(String, [mRendererDelegate abstractMessage:mMessage filterHTMLForMessage:MCO_TO_OBJC(html)]);
+    }
+    else if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage:filterHTMLForMessage:)]) {
         result = MCO_FROM_OBJC(String, [mRendererDelegate MCOAbstractMessage:mMessage filterHTMLForMessage:MCO_TO_OBJC(html)]);
     }
     if (result == NULL) {
@@ -185,7 +227,10 @@ String * MCOAbstractMessageRendererCallback::filterHTMLForMessage(String * html)
 Data * MCOAbstractMessageRendererCallback::dataForIMAPPart(String * folder, IMAPPart * part)
 {
     Data * result = NULL;
-    if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:dataForIMAPPart:folder:)]) {
+    if ([mIMAPDelegate respondsToSelector:@selector(abstractMessage:dataForIMAPPart:folder:)]) {
+        result = [[mIMAPDelegate abstractMessage:mMessage dataForIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)] mco_mcData];
+    }
+    else if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:dataForIMAPPart:folder:)]) {
         result = [[mIMAPDelegate MCOAbstractMessage:mMessage dataForIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)] mco_mcData];
     }
     return result;
@@ -193,14 +238,20 @@ Data * MCOAbstractMessageRendererCallback::dataForIMAPPart(String * folder, IMAP
 
 void MCOAbstractMessageRendererCallback::prefetchAttachmentIMAPPart(String * folder, IMAPPart * part)
 {
-    if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchAttachmentIMAPPart:folder:)]) {
+    if ([mIMAPDelegate respondsToSelector:@selector(abstractMessage:prefetchAttachmentIMAPPart:folder:)]) {
+        [mIMAPDelegate abstractMessage:mMessage prefetchAttachmentIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)];
+    }
+    else if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchAttachmentIMAPPart:folder:)]) {
         [mIMAPDelegate MCOAbstractMessage:mMessage prefetchAttachmentIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)];
     }
 }
 
 void MCOAbstractMessageRendererCallback::prefetchImageIMAPPart(String * folder, IMAPPart * part)
 {
-    if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchImageIMAPPart:folder:)]) {
+    if ([mIMAPDelegate respondsToSelector:@selector(abstractMessage:prefetchImageIMAPPart:folder:)]) {
+        [mIMAPDelegate abstractMessage:mMessage prefetchImageIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)];
+    }
+    else if ([mIMAPDelegate respondsToSelector:@selector(MCOAbstractMessage:prefetchImageIMAPPart:folder:)]) {
         [mIMAPDelegate MCOAbstractMessage:mMessage prefetchImageIMAPPart:MCO_TO_OBJC(part) folder:MCO_TO_OBJC(folder)];
     }
 }