Monotone-Parent: 0dcc6bf2d5286e03f2a6c9e8cd2e0a71cc598ae4

Monotone-Revision: 360795eba52fb9152f5379fc602e210022498ae1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-08-15T19:10:00
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-08-15 19:10:00 +00:00
parent ea11224d2c
commit c3a407efef
2 changed files with 21 additions and 6 deletions

View File

@ -1,5 +1,8 @@
2011-08-15 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailMessage.m (-objectVersion): updated code
as in MAPIStoreGCSMessage's version.
* OpenChange/MAPIStoreMailFolder.m (-messageTable): we no longer
cache the table object as we don't want to assign different
handles to the same memory object, causing inconsistencies with

View File

@ -275,12 +275,24 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
container messageUIDFromMessageKey: [self nameInContainer]];
if (uid)
{
changeNumber = [(MAPIStoreMailFolder *)
container changeNumberForMessageUID: uid];
if (changeNumber)
version = [changeNumber unsignedLongLongValue] >> 16;
else
abort ();
changeNumber = [(MAPIStoreMailFolder *) container
changeNumberForMessageUID: uid];
if (!changeNumber)
{
[self warnWithFormat: @"attempting to get change number"
@" by synchronising folder..."];
[(MAPIStoreMailFolder *) container synchroniseCache];
changeNumber = [(MAPIStoreMailFolder *) container
changeNumberForMessageUID: uid];
if (changeNumber)
[self logWithFormat: @"got one"];
else
{
[self errorWithFormat: @"still nothing. We crash!"];
abort ();
}
}
version = [changeNumber unsignedLongLongValue] >> 16;
}
else
abort ();