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

See ChangeLog. 

Monotone-Parent: ff4eb94e932f095cd5e361229d6ce99ad75c0ba2
Monotone-Revision: 4359e779a09c08a5fd03eda9fd8269ba9eeab6ff

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-03-20T14:33:18
maint-2.0.2
Francis Lachapelle 2012-03-20 14:33:18 +00:00
parent 9a6c91eac0
commit c929c640fb
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-20 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Mailer/SOGoMailObject+Draft.m
(_contentForEditingFromKeys:): prefer the HTML part over the text
part when composing HTML messages.
2012-03-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Main/SOGo+DAV.m (_fillCollections:where:matches:inContext:):

26
SoObjects/Mailer/SOGoMailObject+Draft.m
View File

@ -98,22 +98,38 @@
NSArray *types;
NSDictionary *parts;
NSString *rawPart, *content, *contentKey;
SOGoUserDefaults *ud;
int index;
BOOL htmlContent;
BOOL htmlComposition, htmlContent;
content = @"";
if ([keys count])
{
ud = [[context activeUser] userDefaults];
htmlComposition = [[ud mailComposeMessageType] isEqualToString: @"html"];
htmlContent = NO;
types = [keys objectsForKey: @"mimeType" notFoundMarker: @""];
index = [types indexOfObject: @"text/plain"];
if (index == NSNotFound)
if (htmlComposition)
{
// Prefer HTML content
index = [types indexOfObject: @"text/html"];
htmlContent = YES;
if (index == NSNotFound)
index = [types indexOfObject: @"text/plain"];
else
htmlContent = YES;
}
else
htmlContent = NO;
{
// Prefer text content
index = [types indexOfObject: @"text/plain"];
if (index == NSNotFound)
{
index = [types indexOfObject: @"text/html"];
htmlContent = YES;
}
}
if (index != NSNotFound)
{