Fixed threadID types

3 files changed, 15 insertions, 16 deletions

diff --git a/src/core/imap/MCIMAPMessage.cc b/src/core/imap/MCIMAPMessage.cc
index 5e55ddcc..f8b9f4e6 100644
--- a/src/core/imap/MCIMAPMessage.cc
+++ b/src/core/imap/MCIMAPMessage.cc
@@ -122,12 +122,12 @@ Array * IMAPMessage::gmailLabels()
     return mLabels;
 }
 
-void IMAPMessage::setGmailThreadID(String * threadID)
+void IMAPMessage::setGmailThreadID(uint64_t threadID)
 {
-    MC_SAFE_REPLACE_COPY(String, mThreadID, threadID);
+    mThreadID = threadID;
 }
 
-String * IMAPMessage::gmailThreadID()
+uint64_t IMAPMessage::gmailThreadID()
 {
     return mThreadID;
 }
diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h
index 3a54f4f5..3c2ee9c0 100644
--- a/src/core/imap/MCIMAPMessage.h
+++ b/src/core/imap/MCIMAPMessage.h
@@ -10,13 +10,13 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-
+    
     class IMAPPart;
     class HTMLRendererIMAPCallback;
     class HTMLRendererTemplateCallback;
     
-	class IMAPMessage : public AbstractMessage {
-	public:
+    class IMAPMessage : public AbstractMessage {
+    public:
         IMAPMessage();
         ~IMAPMessage();
         
@@ -38,8 +38,8 @@ namespace mailcore {
         virtual void setGmailLabels(Array * /* String */ labels);
         virtual Array * /* String */ gmailLabels();
         
-        virtual void setGmailThreadID(String * threadID);
-        virtual String * gmailThreadID();
+        virtual void setGmailThreadID(uint64_t threadID);
+        virtual uint64_t gmailThreadID();
         
         virtual AbstractPart * partForPartID(String * partID);
         
@@ -55,17 +55,17 @@ namespace mailcore {
         virtual Object * copy();
         virtual String * description();
         
-	private:
+    private:
         uint64_t mModSeqValue;
         uint32_t mUid;
         MessageFlag mFlags;
         MessageFlag mOriginalFlags;
         AbstractPart * mMainPart;
         Array * /* String */ mLabels;
-        String * mThreadID;
+        uint64_t mThreadID;
         void init();
-	};
-
+    };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index 11e063ae..bad04a81 100644
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -1724,10 +1724,10 @@ static void msg_att_handler(struct mailimap_msg_att * msg_att, void * context)
                 labels->release();
             }
             else if (ext_data->ext_extension == &mailimap_extension_xgmthrid) {
-                String * threadID;
+                uint64_t * threadID;
                 
-                threadID = String::stringWithUTF8Characters((char *) ext_data->ext_data);
-                msg->setGmailThreadID(threadID);
+                threadID = (uint64_t *) ext_data->ext_data;
+                msg->setGmailThreadID(*threadID);
                 hasGmailThreadID = true;
             }
         }
@@ -1837,7 +1837,6 @@ IMAPSyncResult * IMAPSession::fetchMessages(String * folder, IMAPMessagesRequest
         needsGmailLabels = true;
     }
     if ((requestKind & IMAPMessagesRequestKindGmailThreadID) != 0) {
-		MCLog("request flags");
         fetch_att = mailimap_fetch_att_new_xgmthrid();
         mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
         needsGmailThreadID = true;