amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-29 01:52:45 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 8bcefff481572fc23caa92d92861c18902d781bd

Browse Source 
Monotone-Revision: 6d629d88d3b01fa71fac5c998333eed2c61c6232

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-26T15:15:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-10-26 15:15:17 +00:00
parent 1b696fec7f
commit c6b716ef62
13 changed files with 164 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenChange/MAPIStoreMessage.m
View File

@@ -206,7 +206,7 @@ NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email)
- (NSDictionary *) _convertRecipientFromRow: (struct RecipientRow *) row
andColumns: (struct SPropTagArray *) columns
{
NSMutableDictionary *recipient, *properties;
NSMutableDictionary *recipient, *recipientProperties;
SOGoUser *recipientUser;
NSUInteger count, dataPos;
struct mapi_SPropValue mapiValue;
@@ -264,8 +264,8 @@ NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email)
[recipient setObject: value forKey: @"fullName"];
}
properties = [NSMutableDictionary new];
[recipient setObject: properties forKey: @"properties"];
recipientProperties = [NSMutableDictionary new];
[recipient setObject: recipientProperties forKey: @"properties"];
dataPos = 0;
memCtx = talloc_zero (NULL, TALLOC_CTX);
@@ -286,9 +286,9 @@ NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email)
value = NSObjectFromMAPISPropValue (&mapiValue);
dataPos += get_mapi_property_size (&mapiValue);
if (value)
[properties setObject: value forKey: MAPIPropertyKey (columns->aulPropTag[count])];
[recipientProperties setObject: value forKey: MAPIPropertyKey (columns->aulPropTag[count])];
}
[properties release];
[recipientProperties release];
talloc_free (memCtx);
return recipient;
@@ -333,7 +333,7 @@ NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email)
andColumns: columns]];
}
}
[self addNewProperties: recipientProperties];
[self addProperties: recipientProperties];
return MAPISTORE_SUCCESS;
}
@@ -494,7 +494,7 @@ NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email)
[[containerTables objectAtIndex: count]
notifyChangesForChild: self];
[self setIsNew: NO];
[self resetNewProperties];
[self resetProperties];
[container cleanupCaches];
return MAPISTORE_SUCCESS;