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

Monotone-Parent: 9d9059c535146bcefa1a378020e4c39b33d901e2

Browse source 
Monotone-Revision: 256c88e136b95ffb79c997058df4ad39e9e33821

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-16T21:12:12
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2012-03-16 21:12:12 +00:00
parent 7144a0fddb
commit 57fc5197be
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2012-03-16 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2012-03-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreTypes.m (MAPICNCompare): added as void *
parameter so that the function can be used as a comparator
function in NSArray sort methods.
* OpenChange/MAPIStoreMailFolder.m * OpenChange/MAPIStoreMailFolder.m
(-getPidTagMessageClass:inMemCtx:): removed method, as folders are (-getPidTagMessageClass:inMemCtx:): removed method, as folders are
not supposed to return a PidTagMessageClass attribute. not supposed to return a PidTagMessageClass attribute.

4
OpenChange/MAPIStoreGCSFolder.m
View file

@ -631,11 +631,11 @@ static Class NSNumberK;
currentChangeNum currentChangeNum
= [[messageEntry objectForKey: @"version"] = [[messageEntry objectForKey: @"version"]
unsignedLongLongValue]; unsignedLongLongValue];
if (MAPICNCompare (changeNum, currentChangeNum) if (MAPICNCompare (changeNum, currentChangeNum, NULL)
== NSOrderedAscending) == NSOrderedAscending)
{ {
[(NSMutableArray *) deletedKeys addObject: cName]; [(NSMutableArray *) deletedKeys addObject: cName];
if (MAPICNCompare (maxChangeNum, currentChangeNum) if (MAPICNCompare (maxChangeNum, currentChangeNum, NULL)
== NSOrderedAscending) == NSOrderedAscending)
maxChangeNum = currentChangeNum; maxChangeNum = currentChangeNum;
} }

2
OpenChange/MAPIStoreTypes.h
View file

@ -42,7 +42,7 @@ id NSObjectFromSPropValue (const struct SPropValue *);
id NSObjectFromMAPISPropValue (const struct mapi_SPropValue *); id NSObjectFromMAPISPropValue (const struct mapi_SPropValue *);
id NSObjectFromValuePointer (enum MAPITAGS, const void *); id NSObjectFromValuePointer (enum MAPITAGS, const void *);
NSComparisonResult MAPICNCompare (uint64_t cn1, uint64_t cn2); NSComparisonResult MAPICNCompare (uint64_t cn1, uint64_t cn2, void *);
NSComparisonResult MAPIChangeKeyGUIDCompare (NSData *ck1, NSData *ck2, void *); NSComparisonResult MAPIChangeKeyGUIDCompare (NSData *ck1, NSData *ck2, void *);
static inline NSNumber * static inline NSNumber *

2
OpenChange/MAPIStoreTypes.m
View file

@ -284,7 +284,7 @@ _reverseCN (uint64_t cn)
} }
NSComparisonResult NSComparisonResult
MAPICNCompare (uint64_t cn1, uint64_t cn2) MAPICNCompare (uint64_t cn1, uint64_t cn2, void *unused)
{ {
NSComparisonResult result; NSComparisonResult result;