From 1d455ff2b188186a83022d55a53917bca6aed21c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 17 Sep 2008 22:39:40 +0000 Subject: [PATCH] Monotone-Parent: 56874b8e1d2260289bbdde17c8dbc01a15f354e7 Monotone-Revision: d3036531db8d8c0e298e79e7bba85298dba88acd Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-17T22:39:40 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 10 ++++++++++ SoObjects/Mailer/NSData+Mail.m | 2 +- UI/MailPartViewers/UIxMailPartViewer.m | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a40fd100e..db9aa8026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-09-17 Wolfgang Sourdeau + + * UI/MailPartViewers/UIxMailPartViewer.m ([UIxMailPartViewer + -decodedFlatContent]): same as below... + + * SoObjects/Mailer/NSData+Mail.m ([NSData + -bodyDataFromEncoding:encoding]): invoke + "dataByDecodingQuotedPrintableTransferEncoding" on the NSData + instance to avoid decoding "_" chars. + 2008-09-17 Francis Lachapelle * UI/MailerUI/UIxMailAccountActions.m ([WOResponse diff --git a/SoObjects/Mailer/NSData+Mail.m b/SoObjects/Mailer/NSData+Mail.m index 56273bed7..56a30e954 100644 --- a/SoObjects/Mailer/NSData+Mail.m +++ b/SoObjects/Mailer/NSData+Mail.m @@ -44,7 +44,7 @@ else if ([realEncoding isEqualToString: @"base64"]) decodedData = [self dataByDecodingBase64]; else if ([realEncoding isEqualToString: @"quoted-printable"]) - decodedData = [self dataByDecodingQuotedPrintable]; + decodedData = [self dataByDecodingQuotedPrintableTransferEncoding]; else { decodedData = nil; diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m index 9b5a9ff87..596fb3198 100644 --- a/UI/MailPartViewers/UIxMailPartViewer.m +++ b/UI/MailPartViewers/UIxMailPartViewer.m @@ -112,6 +112,7 @@ return flatContent; } +#warning we should use NSData+Mail's bodyDataFromEncoding: instead - (NSData *) decodedFlatContent { NSString *enc; @@ -128,7 +129,7 @@ return [[self flatContent] dataByDecodingBase64]; if ([enc isEqualToString:@"quoted-printable"]) - return [[self flatContent] dataByDecodingQuotedPrintable]; + return [[self flatContent] dataByDecodingQuotedPrintableTransferEncoding]; [self errorWithFormat:@"unsupported MIME encoding: %@", enc];