From 9a6c91eac0ce7bd554aae1ba72b22d98f41a36a7 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 20 Mar 2012 14:05:43 +0000 Subject: [PATCH 1/3] Branch for SOGo v1.3.14 Monotone-Parent: 618681307a4cbc2f326ac0bdd3eb6077cb9a22f4 Monotone-Revision: ff4eb94e932f095cd5e361229d6ce99ad75c0ba2 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-03-20T14:05:43 --- Version | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Version b/Version index 09503ebca..edc60fbcd 100644 --- a/Version +++ b/Version @@ -2,6 +2,6 @@ # This file is included by library makefiles to set the version information # of the executable. -MAJOR_VERSION=2 -MINOR_VERSION=0 -SUBMINOR_VERSION=0 +MAJOR_VERSION=1 +MINOR_VERSION=3 +SUBMINOR_VERSION=14 From c929c640fb28eca025218e2b1d06cfd4266b6a38 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 20 Mar 2012 14:33:18 +0000 Subject: [PATCH 2/3] See ChangeLog. Monotone-Parent: ff4eb94e932f095cd5e361229d6ce99ad75c0ba2 Monotone-Revision: 4359e779a09c08a5fd03eda9fd8269ba9eeab6ff Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-03-20T14:33:18 --- ChangeLog | 6 ++++++ SoObjects/Mailer/SOGoMailObject+Draft.m | 26 ++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c51b99e2d..329fedd75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-20 Francis Lachapelle + + * SoObjects/Mailer/SOGoMailObject+Draft.m + (_contentForEditingFromKeys:): prefer the HTML part over the text + part when composing HTML messages. + 2012-03-19 Wolfgang Sourdeau * Main/SOGo+DAV.m (_fillCollections:where:matches:inContext:): diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m index e27cac368..b0aec21ed 100644 --- a/SoObjects/Mailer/SOGoMailObject+Draft.m +++ b/SoObjects/Mailer/SOGoMailObject+Draft.m @@ -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) { From ccc7e3652340154d867dd5ac6cad0c03d905dd68 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 20 Mar 2012 20:28:54 +0000 Subject: [PATCH 3/3] Monotone-Parent: 4359e779a09c08a5fd03eda9fd8269ba9eeab6ff Monotone-Revision: 20fe3869b4c2b451d086944d0be00758c4b807f0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-03-20T20:28:54 --- SOPE/NGCards/iCalCalendar.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SOPE/NGCards/iCalCalendar.m b/SOPE/NGCards/iCalCalendar.m index 75b266641..0b6801cd5 100644 --- a/SOPE/NGCards/iCalCalendar.m +++ b/SOPE/NGCards/iCalCalendar.m @@ -101,7 +101,9 @@ - (void) setMethod: (NSString *) _value { - [[self uniqueChildWithTag: @"method"] setSingleValue: _value forKey: @""]; + [[self uniqueChildWithTag: @"method"] + setSingleValue: [_value uppercaseString] + forKey: @""]; } - (NSString *) method