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

Monotone-Parent: 08f69e80d11df21083547348b4136cf77bdb5a78 

Monotone-Revision: 152cd7be8bdfd9ff8cd05ec730d08c591d29dc2e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-06T19:17:35
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-08-06 19:17:35 +00:00
parent 5722856993
commit bd8af728ce
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-08-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailVolatileMessage.m (MakeMessageBody):
take "attachmentParts" parameter, deduced from the ivar with the
corresponding name.
* OpenChange/MAPIStoreSOGoObject.m (-objectId): force generation
of objectId by parent, whether it is a folder or not.

23
OpenChange/MAPIStoreMailVolatileMessage.m
View File

@ -309,16 +309,6 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
return rc;
}
- (NSArray *) attachmentsKeysMatchingQualifier: (EOQualifier *) qualifier
andSortOrderings: (NSArray *) sortOrderings
{
NSDictionary *attachments;
attachments = [properties objectForKey: @"attachments"];
return [attachments allKeys];
}
- (NSDate *) creationTime
{
return [sogoObject creationDate];
@ -331,11 +321,7 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
- (id) lookupAttachment: (NSString *) childKey
{
NSDictionary *attachments;
attachments = [properties objectForKey: @"attachments"];
return [attachments objectForKey: childKey];
return [attachmentParts objectForKey: childKey];
}
- (void) getMessageData: (struct mapistore_message **) dataPtr
@ -762,9 +748,8 @@ MakeTextPartBody (NSDictionary *mailProperties, NSDictionary *attachmentParts,
// MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts,
// NSString **contentType)
static id
MakeMessageBody (NSDictionary *mailProperties, NSString **contentType)
MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NSString **contentType)
{
NSDictionary *attachmentParts;
id messageBody, textBody;
NSString *textContentType;
NSArray *parts;
@ -772,7 +757,6 @@ MakeMessageBody (NSDictionary *mailProperties, NSString **contentType)
NGMutableHashMap *headers;
NSUInteger count, max;
attachmentParts = [mailProperties objectForKey: @"attachments"];
textBody = MakeTextPartBody (mailProperties, attachmentParts,
&textContentType);
@ -821,8 +805,7 @@ MakeMessageBody (NSDictionary *mailProperties, NSString **contentType)
[message autorelease];
[headers release];
messageBody = MakeMessageBody (properties, &contentType);
// messageBody = MakeMessageBody (mailProperties, attachmentParts, &contentType);
messageBody = MakeMessageBody (properties, attachmentParts, &contentType);
if (messageBody)
{
[headers setObject: contentType forKey: @"content-type"];