From a12df19771131428dcfb2ffac9ebfaeed1cdffb7 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 26 Sep 2011 18:28:56 +0000
Subject: [PATCH] Monotone-Parent: 80c8d4e2847b46d0107ef53db2c5605e438d8350
 Monotone-Revision: 6388fc7676201a072c315af0fb36851a896f301f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-09-26T18:28:56
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                    |  3 +++
 OpenChange/MAPIStoreFolder.m | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4cd358e42..c9933b59e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 	that "data" is not NULL before passing it to
 	set_SPropValue_proptag as it might be converted to a PT_ERROR
 	value.
+	(-moveCopyMessageWithMID:fromFolder:withMID:wantCopy:): fixed
+	method name. Added PR_CHANGE_KEY and PR_PREDECESSOR_CHANGE_LIST to
+	list of excluded properties.
 
 	* SoObjects/Mailer/SOGoDraftObject.m (-sendMailAndCopyToSent:):
 	renamed "sendMail" and made copying the messsage to the sent
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 2b22d9a85..3e60e4ee4 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -553,10 +553,10 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   return rc;
 }
 
-- (int) moveCopyMessagesWithMID: (uint64_t) srcMid
-                     fromFolder: (MAPIStoreFolder *) sourceFolder
-                        withMID: (uint64_t) targetMid
-                       wantCopy: (uint8_t) wantCopy
+- (int) moveCopyMessageWithMID: (uint64_t) srcMid
+                    fromFolder: (MAPIStoreFolder *) sourceFolder
+                       withMID: (uint64_t) targetMid
+                      wantCopy: (uint8_t) wantCopy
 {
   int rc;
   MAPIStoreMessage *sourceMsg, *destMsg;
@@ -593,6 +593,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   exclusions[PR_SOURCE_KEY >> 16] = true;
   exclusions[PR_PARENT_SOURCE_KEY >> 16] = true;
   exclusions[PR_PARENT_FID >> 16] = true;
+  exclusions[PR_CHANGE_KEY >> 16] = true;
+  exclusions[PR_PREDECESSOR_CHANGE_LIST >> 16] = true;
 
   aRow = talloc_zero (memCtx, struct SRow);
   aRow->lpProps = talloc_array (aRow, struct SPropValue, 65535);
@@ -650,10 +652,10 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   for (count = 0; rc == MAPISTORE_SUCCESS && count < midCount; count++)
     {
       [oldMessageURLs addObject: [mapping urlFromID: srcMids[count]]];
-      rc = [self moveCopyMessagesWithMID: srcMids[count]
-                              fromFolder: sourceFolder
-                                 withMID: targetMids[count]
-                                wantCopy: wantCopy];
+      rc = [self moveCopyMessageWithMID: srcMids[count]
+                             fromFolder: sourceFolder
+                                withMID: targetMids[count]
+                               wantCopy: wantCopy];
     }
 
   /* Notifications */