Monotone-Parent: faa665d09f8735444e5cc6f1e0ca073851cbab3f

Monotone-Revision: d48fed214ae2d8c0aea1b8848de745e3ee235afa

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-07T15:07:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-11-07 15:07:37 +00:00
parent d02400dfc1
commit e67931703f
4 changed files with 32 additions and 33 deletions

View File

@@ -898,33 +898,28 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
return rc;
}
- (int) addPropertiesFromRow: (struct SRow *) aRow
- (void) addProperties: (NSDictionary *) newProperties
{
static enum MAPITAGS bannedProps[] = { PR_MID, PR_FID, PR_PARENT_FID,
PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY,
PR_CHANGE_KEY, 0x00000000 };
enum MAPITAGS *currentProp;
int rc;
rc = [super addPropertiesFromRow: aRow];
NSMutableDictionary *propsCopy;
/* TODO: this should no longer be required once mapistore v2 API is in
place, when we can then do this from -dealloc below */
if ([properties count] > 0)
{
currentProp = bannedProps;
while (*currentProp)
{
[properties removeObjectForKey: MAPIPropertyKey (*currentProp)];
currentProp++;
}
[propsMessage appendProperties: properties];
[propsMessage save];
[self resetProperties];
propsCopy = [newProperties mutableCopy];
currentProp = bannedProps;
while (*currentProp)
{
[propsCopy removeObjectForKey: MAPIPropertyKey (*currentProp)];
currentProp++;
}
return rc;
[propsMessage appendProperties: propsCopy];
[propsMessage save];
[propsCopy release];
}
- (void) dealloc