Monotone-Parent: caeb3d98458e98b0f36475b43626279ed156e598

Monotone-Revision: 0d3cf6e6df797aaeaebcf6b6b99f0d547f5a6c9d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-05T17:30:44
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2007-11-05 17:30:44 +00:00
parent 9b37c8d82b
commit a164feb06b
2 changed files with 11 additions and 2 deletions

View File

@ -1,5 +1,10 @@
2007-11-05 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoMailObject+Draft.m ([SOGoMailObject
-contentForEditing]): make sure the htmlContent flag is set to NO
when we select the textual part. Also we select only the relevant
keys for fetching.
* UI/MailerUI/WOContext+UIxMailer.m ([-mailSubjectFormatter]):
removed method.

View File

@ -75,7 +75,7 @@
{
NSArray *types;
NSDictionary *parts;
NSString *rawPart, *content;
NSString *rawPart, *content, *contentKey;
int index;
BOOL htmlContent;
@ -88,11 +88,15 @@
index = [types indexOfObject: @"text/html"];
htmlContent = YES;
}
else
htmlContent = NO;
if (index == NSNotFound)
content = @"";
else
{
parts = [self fetchPlainTextStrings: keys];
contentKey = [keys objectAtIndex: index];
parts = [self fetchPlainTextStrings:
[NSArray arrayWithObject: contentKey]];
rawPart = [[parts allValues] objectAtIndex: 0];
if (htmlContent)
content = [rawPart htmlToText];