Monotone-Parent: 25d90ddcd05eb7c341bcb5f66062d03818381a34

Monotone-Revision: 3a355e79e6eee869bec77ad32e28a6640e81cd02

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-09T15:49:45
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
C Robert 2009-07-09 15:49:45 +00:00
parent 345e4279b1
commit 4eb7fbc4c9
2 changed files with 12 additions and 1 deletions

View File

@ -2,6 +2,8 @@
* UI/MailPartViewers/UIxMailRenderingContext.m: Display .tiff as
attachments, some browsers don't support tiff.
* SoObjects/Mailer/SOGoDraftObject.m: Fixed content type for multipart
messages.
2009-07-07 Francis Lachapelle <flachapelle@inverse.ca>

View File

@ -851,6 +851,9 @@ static BOOL showTextAttachmentsInline = NO;
*/
NGMutableHashMap *map;
NGMimeBodyPart *bodyPart;
NSUserDefaults *ud;
ud = [[context activeUser] userDefaults];
/* prepare header of body part */
@ -859,7 +862,13 @@ static BOOL showTextAttachmentsInline = NO;
// TODO: set charset in header!
[map setObject: @"text/plain" forKey: @"content-type"];
if (text)
[map setObject: contentTypeValue forKey: @"content-type"];
{
if ([[ud stringForKey: @"ComposeMessagesType"] isEqualToString: @"html"])
[map setObject: htmlContentTypeValue
forKey: @"content-type"];
else
[map setObject: contentTypeValue forKey: @"content-type"];
}
// if ((body = text) != nil) {
// if ([body isKindOfClass: [NSString class]]) {