fixed IMAPAsyncConnection initialization, added helper methods

4 files changed, 23 insertions, 0 deletions

diff --git a/src/objc/utils/NSData+MCO.h b/src/objc/utils/NSData+MCO.h
index 18da1492..9ed227bb 100644
--- a/src/objc/utils/NSData+MCO.h
+++ b/src/objc/utils/NSData+MCO.h
@@ -10,6 +10,8 @@
 
 #include <mailcore/mailcore.h>
 
+#ifdef __OBJC__
+
 @interface NSData (MCO)
 
 #ifdef __cplusplus
@@ -17,3 +19,5 @@
 #endif
 
 @end
+
+#endif
diff --git a/src/objc/utils/NSData+MCO.mm b/src/objc/utils/NSData+MCO.mm
index 10c63f7e..abec3077 100644
--- a/src/objc/utils/NSData+MCO.mm
+++ b/src/objc/utils/NSData+MCO.mm
@@ -12,6 +12,9 @@
 
 + (NSData *) mco_dataWithMCData:(mailcore::Data *)cppData
 {
+    if (cppData == NULL)
+        return nil;
+    
     return [NSData dataWithBytes:cppData->bytes() length:cppData->length()];
 }
 
diff --git a/src/objc/utils/NSString+MCO.h b/src/objc/utils/NSString+MCO.h
index 087f5220..eb009e1c 100644
--- a/src/objc/utils/NSString+MCO.h
+++ b/src/objc/utils/NSString+MCO.h
@@ -10,10 +10,15 @@
 
 #include <mailcore/mailcore.h>
 
+#ifdef __OBJC__
+
 @interface NSString (MCO)
 
 #ifdef __cplusplus
 + (NSString *) mco_stringWithMCString:(mailcore::String *)cppString;
++ (NSString *) mco_stringWithMCObject:(mailcore::Object *)object;
 #endif
 
 @end
+
+#endif
diff --git a/src/objc/utils/NSString+MCO.mm b/src/objc/utils/NSString+MCO.mm
index 9ef0cf06..f7771469 100644
--- a/src/objc/utils/NSString+MCO.mm
+++ b/src/objc/utils/NSString+MCO.mm
@@ -12,7 +12,18 @@
 
 + (NSString *) mco_stringWithMCString:(mailcore::String *)cppString
 {
+    if (cppString == NULL)
+        return nil;
+    
     return [NSString stringWithCharacters:(const unichar *) cppString->unicodeCharacters() length:cppString->length()];
 }
 
++ (NSString *) mco_stringWithMCObject:(mailcore::Object *)object
+{
+    if (object == NULL)
+        return nil;
+    
+    return [NSString mco_stringWithMCString:object->description()];
+}
+
 @end