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

propagate from branch 'ca.inverse.sogo.1_3_14' (head 4359e779a09c08a5fd03eda9fd8269ba9eeab6ff)

Browse source 
to branch 'ca.inverse.sogo' (head 4adb09f9c02af62ea07b317c5c6a14100b8204e1)

Monotone-Parent: 4359e779a09c08a5fd03eda9fd8269ba9eeab6ff
Monotone-Parent: 4adb09f9c02af62ea07b317c5c6a14100b8204e1
Monotone-Revision: 5dde5ea96fd96485574abc6ba0f295b147b1ff16

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-03-20T14:39:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2012-03-20 14:39:06 +00:00
parent c929c640fb 9f74010f99
commit e30a9e1238
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -4,6 +4,12 @@
(_contentForEditingFromKeys:): prefer the HTML part over the text
part when composing HTML messages.
2012-03-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreTypes.m (MAPIChangeKeyGUIDCompare): NSData
arguments passed as "id" due to the pickiness of some versions of
gcc.
2012-03-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Main/SOGo+DAV.m (_fillCollections:where:matches:inContext:):

2
OpenChange/MAPIStoreTypes.h
View file

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

3
OpenChange/MAPIStoreTypes.m
View file

@ -298,7 +298,8 @@ MAPICNCompare (uint64_t cn1, uint64_t cn2, void *unused)
return result;
}
NSComparisonResult MAPIChangeKeyGUIDCompare (NSData *ck1, NSData *ck2, void *unused)
NSComparisonResult
MAPIChangeKeyGUIDCompare (id ck1, id ck2, void *unused)
{
NSUInteger count;
const unsigned char *ptr1, *ptr2;