From ea156c6474f149dcbf8c8dd0d9754b9f0f41c284 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 4 Jan 2010 16:05:12 +0000 Subject: [PATCH] Monotone-Parent: a2b439e6942cf7fae5cee8b06159f0a6c4ac6ba6 Monotone-Revision: 6c4b67f10763651f27f21ba2134b29a42250c6e4 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-04T16:05:12 Monotone-Branch: ca.inverse.sogo --- SoObjects/Mailer/SOGoMailForward.m | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m index 52159376e..3eb5d8980 100644 --- a/SoObjects/Mailer/SOGoMailForward.m +++ b/SoObjects/Mailer/SOGoMailForward.m @@ -34,17 +34,13 @@ - (id) init { + SOGoUserDefaults *ud; + if ((self = [super init])) { - SOGoUserDefaults *ud; ud = [[context activeUser] userDefaults]; - - // Backward comptability with <= 1.1.0 (ComposeMessagesType) - if ([ud objectForKey: @"ComposeMessagesType"]) - htmlComposition = [[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"]; - else - htmlComposition = [[ud objectForKey: @"SOGoMailComposeMessageType"] isEqualToString: @"html"]; - + htmlComposition + = [[ud mailComposeMessageType] isEqualToString: @"html"]; sourceMail = nil; currentValue = nil; }