LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: e287e19d922a91499f1429d7f16d9bd161d1260e 

Monotone-Revision: b76df21b12b927a0f3947b610200a0571cb5d9f1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-09-24T00:10:26
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-09-24 00:10:26 +00:00
parent cbc6d76688
commit ed1b687f91
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-09-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailFolder.m (-synchroniseCache): renamed
local var "folderWasModified" to "foundChange", as in
MAPIStoreGCSFolder's version. Fixed a bug where "foundChange"
would be reset to NO when deletes were not found, even if new
elements were detected.
2011-09-23 Francis Lachapelle <flachapelle@inverse.ca>
* UI/PreferencesUI/UIxPreferences.m (-defaultCalendarList, -itemCalendarText,

12
OpenChange/MAPIStoreMailFolder.m
View File

@ -481,7 +481,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
NSData *changeKey;
NSMutableDictionary *currentProperties, *messages, *mapping, *messageEntry;
NSCalendarDate *now;
BOOL folderWasModified = NO;
BOOL foundChange = NO;
now = [NSCalendarDate date];
[now setTimeZone: utcTZ];
@ -564,7 +564,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
}
ldb_transaction_commit([[self context] connectionInfo]->oc_ctx);
folderWasModified = YES;
foundChange = YES;
}
if (lastModseq)
@ -572,12 +572,12 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
/* FIXME: the problem here is that if a delete is the last operation
performed on a folder, the SyncLastSynchronisationDate will continuously
get updated until a new modseq shows up */
folderWasModified = [[(SOGoMailFolder *) sogoObject
fetchUIDsOfVanishedItems: lastModseqNbr]
count] > 0;
foundChange |= [[(SOGoMailFolder *) sogoObject
fetchUIDsOfVanishedItems: lastModseqNbr]
count] > 0;
}
if (folderWasModified)
if (foundChange)
{
ti = [NSNumber numberWithDouble: [now timeIntervalSince1970]];
[currentProperties setObject: ti