diff options
| -rw-r--r-- | src/core/abstract/MCMessageConstants.h | 2 | ||||
| -rw-r--r-- | src/core/imap/MCIMAPSearchExpression.cc | 6 | ||||
| -rw-r--r-- | src/core/imap/MCIMAPSearchExpression.h | 2 | ||||
| -rwxr-xr-x | src/core/imap/MCIMAPSession.cc | 4 | ||||
| -rw-r--r-- | src/objc/abstract/MCOConstants.h | 2 | ||||
| -rw-r--r-- | src/objc/imap/MCOIMAPSearchExpression.h | 4 | ||||
| -rw-r--r-- | src/objc/imap/MCOIMAPSearchExpression.mm | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h index 4ad14b89..baac7061 100644 --- a/src/core/abstract/MCMessageConstants.h +++ b/src/core/abstract/MCMessageConstants.h @@ -168,7 +168,7 @@ namespace mailcore { IMAPSearchKindSubject, IMAPSearchKindContent, IMAPSearchKindHeader, - IMAPSearchKindGmailThreadId, + IMAPSearchKindGmailThreadID, IMAPSearchKindOr, IMAPSearchKindAnd, }; diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc index b07c935f..86111f2e 100644 --- a/src/core/imap/MCIMAPSearchExpression.cc +++ b/src/core/imap/MCIMAPSearchExpression.cc @@ -59,7 +59,7 @@ String * IMAPSearchExpression::description() case IMAPSearchKindHeader: return String::stringWithUTF8Format("<%s:%p Header %s %s>", MCUTF8(className()), this, MCUTF8(mHeader->description()), MCUTF8(mValue->description())); - case IMAPSearchKindGmailThreadId: + case IMAPSearchKindGmailThreadID: return String::stringWithUTF8Format("<%s:%p X-GM-THRID %llu>", MCUTF8(className()), this, mLongNumber); case IMAPSearchKindOr: @@ -124,10 +124,10 @@ IMAPSearchExpression * IMAPSearchExpression::searchHeader(String * header, Strin return (IMAPSearchExpression *) expr->autorelease(); } -IMAPSearchExpression * IMAPSearchExpression::searchGmailThreadId(uint64_t number) +IMAPSearchExpression * IMAPSearchExpression::searchGmailThreadID(uint64_t number) { IMAPSearchExpression * expr = new IMAPSearchExpression(); - expr->mKind = IMAPSearchKindGmailThreadId; + expr->mKind = IMAPSearchKindGmailThreadID; expr->mLongNumber = number; return (IMAPSearchExpression *) expr->autorelease(); } diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h index eca94ddd..352336d3 100644 --- a/src/core/imap/MCIMAPSearchExpression.h +++ b/src/core/imap/MCIMAPSearchExpression.h @@ -27,7 +27,7 @@ namespace mailcore { static IMAPSearchExpression * searchSubject(String * value); static IMAPSearchExpression * searchContent(String * value); static IMAPSearchExpression * searchHeader(String * header, String * value); - static IMAPSearchExpression * searchGmailThreadId(uint64_t number); + static IMAPSearchExpression * searchGmailThreadID(uint64_t number); static IMAPSearchExpression * searchAnd(IMAPSearchExpression * left, IMAPSearchExpression * right); static IMAPSearchExpression * searchOr(IMAPSearchExpression * left, IMAPSearchExpression * right); diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index c3a13cd1..4798b880 100755 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -2594,9 +2594,9 @@ static struct mailimap_search_key * searchKeyFromSearchExpression(IMAPSearchExpr { return mailimap_search_key_new_header(strdup(expression->header()->UTF8Characters()), strdup(expression->value()->UTF8Characters())); } - case IMAPSearchKindGmailThreadId: + case IMAPSearchKindGmailThreadID: { - return mailimap_search_key_xgmthrid(expression->longNumber()); + return mailimap_search_key_xgmthrid_new(expression->longNumber()); } case IMAPSearchKindOr: { diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h index 794d7dee..0244f17d 100644 --- a/src/objc/abstract/MCOConstants.h +++ b/src/objc/abstract/MCOConstants.h @@ -171,7 +171,7 @@ typedef enum { /** Match headers of the message.*/ MCOIMAPSearchKindHeader, /** Match X-GM-THRID.*/ - MCOIMAPSearchGmailThreadId, + MCOIMAPSearchGmailThreadID, /** Or expresssion.*/ MCOIMAPSearchKindOr, /** And expression.*/ diff --git a/src/objc/imap/MCOIMAPSearchExpression.h b/src/objc/imap/MCOIMAPSearchExpression.h index 508ae08b..73eefd23 100644 --- a/src/objc/imap/MCOIMAPSearchExpression.h +++ b/src/objc/imap/MCOIMAPSearchExpression.h @@ -76,9 +76,9 @@ Example: - MCOIMAPSearchExpression * expr = [MCOIMAPSearchExpression searchGmailThredId:aThreadId] + MCOIMAPSearchExpression * expr = [MCOIMAPSearchExpression searchGmailThreadID:aThreadID] */ -+ (MCOIMAPSearchExpression *) searchGmailThreadId:(uint64_t)number; ++ (MCOIMAPSearchExpression *) searchGmailThreadID:(uint64_t)number; /** Creates a search expression that's a disjunction of two search expressions. diff --git a/src/objc/imap/MCOIMAPSearchExpression.mm b/src/objc/imap/MCOIMAPSearchExpression.mm index e3effc6a..b727f9f8 100644 --- a/src/objc/imap/MCOIMAPSearchExpression.mm +++ b/src/objc/imap/MCOIMAPSearchExpression.mm @@ -87,9 +87,9 @@ return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchHeader([header mco_mcString], [value mco_mcString])); } -+ (MCOIMAPSearchExpression *) searchGmailThreadId:(uint64_t)number ++ (MCOIMAPSearchExpression *) searchGmailThreadID:(uint64_t)number { - return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchGmailThreadId(number)); + return MCO_TO_OBJC(mailcore::IMAPSearchExpression::searchGmailThreadID(number)); } + (MCOIMAPSearchExpression *) searchAnd:(MCOIMAPSearchExpression *)expression other:(MCOIMAPSearchExpression *)other |