diff options
| author |  Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-10-25 21:29:49 -0700 |
|---|---|---|
| committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-10-25 21:29:49 -0700 |
| commit | c7495855dede7a43d1d51e4c6c7aae8091c4938e (patch) | |
| tree | 6e1c7db1dbeb736be6a44be9b4cf18a5cfe06a0a | |
| parent | 22caaf22182c2ece9a368bace9e31efa52ca567a (diff) | |
| parent | 99fa8877b04008121bd16c5b86bab1cb7dc5b3dd (diff) | |
Merge branch 'master' into removing-icu-dependency
| -rw-r--r-- | src/objc/imap/MCOIMAPFetchParsedContentOperation.mm | 2 | ||||
| -rw-r--r-- | src/objc/rfc822/MCOMessageParser.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/objc/imap/MCOIMAPFetchParsedContentOperation.mm b/src/objc/imap/MCOIMAPFetchParsedContentOperation.mm index 5c1ebde3..10447be1 100644 --- a/src/objc/imap/MCOIMAPFetchParsedContentOperation.mm +++ b/src/objc/imap/MCOIMAPFetchParsedContentOperation.mm @@ -14,7 +14,7 @@ #import "MCOOperation+Private.h" #import "MCOUtils.h" -typedef void (^CompletionType)(NSError *error, NSData * data); +typedef void (^CompletionType)(NSError *error, MCOMessageParser * parser); @implementation MCOIMAPFetchParsedContentOperation { CompletionType _completionBlock; diff --git a/src/objc/rfc822/MCOMessageParser.mm b/src/objc/rfc822/MCOMessageParser.mm index 78b84c78..2b0866a3 100644 --- a/src/objc/rfc822/MCOMessageParser.mm +++ b/src/objc/rfc822/MCOMessageParser.mm @@ -39,7 +39,7 @@ - (id) initWithData:(NSData *)data { - mailcore::MessageParser * message = new mailcore::MessageParser([data mco_mcData]); + mailcore::MessageParser * message = new mailcore::MessageParser((CFDataRef) data); self = [super initWithMCMessage:message]; MC_SAFE_RELEASE(message); return self; |