From be00aa89b8b6fc4e505be797669dc3f42bccfa9f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 24 Feb 2011 21:15:04 +0000 Subject: [PATCH] Monotone-Parent: a811cbd171c64445b4b32261e56c4b5085787de0 Monotone-Revision: c33cbc477978136a5d59d29b8df81cdc54cffc70 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-02-24T21:15:04 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ OpenChange/MAPIStoreContext.m | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 582902b49..6bc0f79e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-02-24 Wolfgang Sourdeau + * OpenChange/MAPIStoreContext.m + (-setProperty:withFMID:ofTableType:fromFile:): considering the + cached message as a MAPIStoreMessage instance instead of NSDictionary. + * OpenChange/MAPIStoreMailMessage.m (_fetchAttachmentPartsInBodyInfo:withPrefix:): detect attachment parts based on the existence of the "filename" info parameter. diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m index d4f926e20..5c1ad4958 100644 --- a/OpenChange/MAPIStoreContext.m +++ b/OpenChange/MAPIStoreContext.m @@ -881,7 +881,7 @@ _prepareContextClass (struct mapistore_context *newMemCtx, ofTableType: (uint8_t) tableType fromFile: (NSFileHandle *) aFile { - NSMutableDictionary *message; + MAPIStoreMessage *message; NSNumber *midKey; NSData *fileData; const char *propName; @@ -901,10 +901,11 @@ _prepareContextClass (struct mapistore_context *newMemCtx, message = [messages objectForKey: midKey]; if (message) { - [message setObject: NSObjectFromStreamData (property, fileData) - forKey: MAPIPropertyKey (property)]; - [self logWithFormat: @"(%s) message props after op", __PRETTY_FUNCTION__]; - MAPIStoreDumpMessageProperties (message); + [message addNewProperties: + [NSDictionary + dictionaryWithObject: NSObjectFromStreamData (property, + fileData) + forKey: MAPIPropertyKey (property)]]; rc = MAPISTORE_SUCCESS; } else