amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-22 14:52:44 +00:00
Code Issues Projects Releases Wiki Activity

merge of '1e156d58cc527cdcdd61317d54c6ba7dc0b863c2'

Browse Source 
and 'd830b49b93b3b05bd3b392063b915cc6954ee1a1'

Monotone-Parent: 1e156d58cc527cdcdd61317d54c6ba7dc0b863c2
Monotone-Parent: d830b49b93b3b05bd3b392063b915cc6954ee1a1
Monotone-Revision: e287e19d922a91499f1429d7f16d9bd161d1260e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-09-23T20:04:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-09-23 20:04:32 +00:00
parent 40733f1f52 e5b0d6813c
commit cbc6d76688
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -12,6 +12,14 @@
2011-09-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreGCSMessage.m (-getPrChangeKey:inMemCtx:):
first force a synchronisation of the parent cache if the change key
cannot be retrieved and invoke abort if the change key is still
not available afterwards.
* OpenChange/MAPIStoreMailMessage.m (-getPrChangeKey:inMemCtx:):
same as above.
* OpenChange/MAPIStoreMailFolder.m (-lastMessageModificationTime):
invoke "synchroniseCache" in order to make sure we return the real
last modification time.

12
OpenChange/MAPIStoreGCSMessage.m
View File

@@ -52,13 +52,21 @@
{
int rc = MAPISTORE_SUCCESS;
NSData *changeKey;
MAPIStoreGCSFolder *parentFolder;
NSString *nameInContainer;
if (isNew)
rc = MAPISTORE_ERR_NOT_FOUND;
else
{
changeKey = [(MAPIStoreGCSFolder *)[self container]
changeKeyForMessageWithKey: [self nameInContainer]];
parentFolder = (MAPIStoreGCSFolder *)[self container];
nameInContainer = [self nameInContainer];
changeKey = [parentFolder changeKeyForMessageWithKey: nameInContainer];
if (!changeKey)
{
[parentFolder synchroniseCache];
changeKey = [parentFolder changeKeyForMessageWithKey: nameInContainer];
}
if (!changeKey)
abort ();
*data = [changeKey asBinaryInMemCtx: memCtx];

12
OpenChange/MAPIStoreMailMessage.m
View File

@@ -284,13 +284,21 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
{
int rc = MAPISTORE_SUCCESS;
NSData *changeKey;
MAPIStoreMailFolder *parentFolder;
NSString *nameInContainer;
if (isNew)
rc = MAPISTORE_ERR_NOT_FOUND;
else
{
changeKey = [(MAPIStoreMailFolder *)[self container]
changeKeyForMessageWithKey: [self nameInContainer]];
parentFolder = (MAPIStoreMailFolder *)[self container];
nameInContainer = [self nameInContainer];
changeKey = [parentFolder changeKeyForMessageWithKey: nameInContainer];
if (!changeKey)
{
[parentFolder synchroniseCache];
changeKey = [parentFolder changeKeyForMessageWithKey: nameInContainer];
}
if (!changeKey)
abort ();
*data = [changeKey asBinaryInMemCtx: memCtx];