diff options
| author |  CodaFi <devteam.codafi@gmail.com> | 2013-06-23 20:04:24 -0600 |
|---|---|---|
| committer | CodaFi <devteam.codafi@gmail.com> | 2013-06-23 20:04:24 -0600 |
| commit | 0875263e2d5aad17aee6852760fbbc74be19497e (patch) | |
| tree | 38f9516f5cc723af201794a989effb96d697ac6d | |
| parent | bf7692b7dfde52d439e0ab4d18d9ee814a3d29fd (diff) | |
| parent | d33c82fddc321046279b043c058cf27990ac97b4 (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | src/core/abstract/MCMessageConstants.h | 3 | ||||
| -rw-r--r-- | src/core/imap/MCIMAPMessage.cc | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h index eb9e80f4..417bdb6c 100644 --- a/src/core/abstract/MCMessageConstants.h +++ b/src/core/abstract/MCMessageConstants.h @@ -65,7 +65,8 @@ namespace mailcore { IMAPMessagesRequestKindFullHeaders = 1 << 4, IMAPMessagesRequestKindHeaderSubject = 1 << 5, IMAPMessagesRequestKindGmailLabels = 1 << 6, - IMAPMessagesRequestKindGmailThreadID = 1 << 7, + IMAPMessagesRequestKindGmailMessageID = 1 << 7, + IMAPMessagesRequestKindGmailThreadID = 1 << 8, }; enum IMAPFetchRequestType { diff --git a/src/core/imap/MCIMAPMessage.cc b/src/core/imap/MCIMAPMessage.cc index 8da33130..e4a3aea5 100644 --- a/src/core/imap/MCIMAPMessage.cc +++ b/src/core/imap/MCIMAPMessage.cc @@ -20,6 +20,8 @@ void IMAPMessage::init() mMainPart = NULL; mLabels = NULL; mModSeqValue = 0; + mThreadID = 0; + mMessageID = 0; } IMAPMessage::IMAPMessage() @@ -35,7 +37,8 @@ IMAPMessage::IMAPMessage(IMAPMessage * other) setOriginalFlags(other->originalFlags()); setMainPart((AbstractPart *) other->mainPart()->copy()->autorelease()); setGmailLabels(other->gmailLabels()); - setGmailThreadID(other->gmailThreadID()); + setGmailThreadID(other->gmailThreadID()); + setGmailMessageID(other->gmailMessageID()); } IMAPMessage::~IMAPMessage() |