amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-13 07:47:12 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 80c8d4e2847b46d0107ef53db2c5605e438d8350

Browse Source 
Monotone-Revision: 6388fc7676201a072c315af0fb36851a896f301f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-09-26T18:28:56
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2011-09-26 18:28:56 +00:00
1 parent 63fb2baa8f
commit a12df19771
2 files changed
+13 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+3
View File
@@ -5,6 +5,9 @@
that "data" is not NULL before passing it to that "data" is not NULL before passing it to
set_SPropValue_proptag as it might be converted to a PT_ERROR set_SPropValue_proptag as it might be converted to a PT_ERROR
value. 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:): * SoObjects/Mailer/SOGoDraftObject.m (-sendMailAndCopyToSent:):
renamed "sendMail" and made copying the messsage to the sent renamed "sendMail" and made copying the messsage to the sent
OpenChange/MAPIStoreFolder.m
+10 -8
View File
@@ -553,10 +553,10 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
return rc; return rc;
} }
- (int) moveCopyMessagesWithMID: (uint64_t) srcMid - (int) moveCopyMessageWithMID: (uint64_t) srcMid
fromFolder: (MAPIStoreFolder *) sourceFolder fromFolder: (MAPIStoreFolder *) sourceFolder
withMID: (uint64_t) targetMid withMID: (uint64_t) targetMid
wantCopy: (uint8_t) wantCopy wantCopy: (uint8_t) wantCopy
{ {
int rc; int rc;
MAPIStoreMessage *sourceMsg, *destMsg; MAPIStoreMessage *sourceMsg, *destMsg;
@@ -593,6 +593,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
exclusions[PR_SOURCE_KEY >> 16] = true; exclusions[PR_SOURCE_KEY >> 16] = true;
exclusions[PR_PARENT_SOURCE_KEY >> 16] = true; exclusions[PR_PARENT_SOURCE_KEY >> 16] = true;
exclusions[PR_PARENT_FID >> 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 = talloc_zero (memCtx, struct SRow);
aRow->lpProps = talloc_array (aRow, struct SPropValue, 65535); 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++) for (count = 0; rc == MAPISTORE_SUCCESS && count < midCount; count++)
{ {
[oldMessageURLs addObject: [mapping urlFromID: srcMids[count]]]; [oldMessageURLs addObject: [mapping urlFromID: srcMids[count]]];
rc = [self moveCopyMessagesWithMID: srcMids[count] rc = [self moveCopyMessageWithMID: srcMids[count]
fromFolder: sourceFolder fromFolder: sourceFolder
withMID: targetMids[count] withMID: targetMids[count]
wantCopy: wantCopy]; wantCopy: wantCopy];
} }
/* Notifications */ /* Notifications */