From 2f903a1f75a3160beb5464f1431522a15a785734 Mon Sep 17 00:00:00 2001 From: Bob Van Osten Date: Thu, 14 Nov 2013 17:52:40 -0800 Subject: threadId -> threadID --- src/core/imap/MCIMAPSearchExpression.cc | 6 +++--- src/core/imap/MCIMAPSearchExpression.h | 2 +- src/core/imap/MCIMAPSession.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/imap') 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: { -- cgit v1.2.3