fixed bridging of objects

3 files changed, 5 insertions, 16 deletions

diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
index d0af62b2..56f08aa7 100644
--- a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
+++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
@@ -30,7 +30,7 @@ using namespace mailcore;
 
 #define nativeType mailcore::IMAPFetchFoldersOperation
 
-+ (void) initialize
++ (void) load
 {
     MCORegisterClass(self, &typeid(nativeType));
 }
diff --git a/src/objc/imap/MCOIMAPOperation.mm b/src/objc/imap/MCOIMAPOperation.mm
index c2b36e26..700269b3 100644
--- a/src/objc/imap/MCOIMAPOperation.mm
+++ b/src/objc/imap/MCOIMAPOperation.mm
@@ -25,17 +25,6 @@
 
 #define nativeType mailcore::IMAPOperation
 
-+ (void) initialize
-{
-    MCORegisterClass(self, &typeid(nativeType));
-}
-
-+ (NSObject *) mco_objectWithMCObject:(mailcore::Object *)object
-{
-    mailcore::IMAPOperation * op = (mailcore::IMAPOperation *) object;
-    return [[[self alloc] initWithMCOperation:op] autorelease];
-}
-
 - (void)start:(void (^)(NSError *error))completionBlock {
     self.completionBlock = completionBlock;
     [self start];
diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm
index a4a6e5cc..2a8c7465 100644
--- a/src/objc/imap/MCOIMAPSession.mm
+++ b/src/objc/imap/MCOIMAPSession.mm
@@ -9,6 +9,7 @@
 #import "MCOIMAPSession.h"
 
 #import "MCOOperation.h"
+#import "MCOOperation+Private.h"
 #import "MCOObjectWrapper.h"
 #import "MCOIMAPOperation.h"
 #import "MCOIMAPFetchFoldersOperation.h"
@@ -59,13 +60,12 @@ MCO_OBJC_SYNTHESIZE_SCALAR(char, char, setDelimiter, delimiter)
 
 - (MCOIMAPOperation *)checkAccountOperation {
     IMAPOperation *coreOp = MCO_NATIVE_INSTANCE->checkAccountOperation();
-    return MCO_TO_OBJC(coreOp);
-
+    return [[[MCOIMAPOperation alloc] initWithMCOperation:coreOp] autorelease];
 }
 
 - (MCOIMAPFetchFoldersOperation *)fetchAllFoldersOperation {
     IMAPOperation *coreOp = MCO_NATIVE_INSTANCE->fetchAllFoldersOperation();
-    return MCO_TO_OBJC(coreOp);
-    
+    return [[[MCOIMAPFetchFoldersOperation alloc] initWithMCOperation:coreOp] autorelease];
 }
+
 @end