aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar DINH Viêt Hoà <dinh.viet.hoa@gmail.com>2013-05-28 21:26:17 -0700
committerGravatar DINH Viêt Hoà <dinh.viet.hoa@gmail.com>2013-05-28 21:26:17 -0700
commitfdd156330a09488cd0d970dbdc60bcb299daa79b (patch)
tree5c2f3c5facb7b8bb2eb557199a82caa929ba8ad6
parenteb0daeaf247c11df6ba05b869a36b129d05e99a9 (diff)
parent0b9d6179767acf9cb5ef91370492cf3188d38e5a (diff)
Merge pull request #58 from pushkarsingh/master
Fixed the crashes while using the MCIMAPSearchExpression, mKind was not set and missing mco_mcObject function
-rw-r--r--src/core/imap/MCIMAPSearchExpression.cc2
-rw-r--r--src/objc/imap/MCOIMAPSearchExpression.mm5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc
index 55b0fc7f..373b93aa 100644
--- a/src/core/imap/MCIMAPSearchExpression.cc
+++ b/src/core/imap/MCIMAPSearchExpression.cc
@@ -19,7 +19,7 @@ IMAPSearchExpression::IMAPSearchExpression()
IMAPSearchExpression::IMAPSearchExpression(IMAPSearchExpression * other)
{
init();
- mKind = IMAPSearchKindNone;
+ mKind = other->mKind;
MC_SAFE_REPLACE_COPY(String, mHeader, other->mHeader);
MC_SAFE_REPLACE_COPY(String, mValue, other->mValue);
MC_SAFE_REPLACE_COPY(IMAPSearchExpression, mLeftExpression, other->mLeftExpression);
diff --git a/src/objc/imap/MCOIMAPSearchExpression.mm b/src/objc/imap/MCOIMAPSearchExpression.mm
index 18e5fdc7..ecc44ba6 100644
--- a/src/objc/imap/MCOIMAPSearchExpression.mm
+++ b/src/objc/imap/MCOIMAPSearchExpression.mm
@@ -37,6 +37,11 @@
return [[[self alloc] initWithMCExpression:expr] autorelease];
}
+- (mailcore::Object *) mco_mcObject
+{
+ return _nativeExpr;
+}
+
- (id) initWithMCExpression:(mailcore::IMAPSearchExpression *)expr
{
self = [super init];