merge of '6fed1c4d16e6a86a4b38ab7174119068a10f5ede'
and 'd3036531db8d8c0e298e79e7bba85298dba88acd' Monotone-Parent: 6fed1c4d16e6a86a4b38ab7174119068a10f5ede Monotone-Parent: d3036531db8d8c0e298e79e7bba85298dba88acd Monotone-Revision: 4a4fbde667da9c301d01687c66ff392bca9d1658 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2008-09-18T18:04:16 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
8c1813b019
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2008-09-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* 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 <flachapelle@inverse.ca>
|
2008-09-17 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
* UI/MailerUI/UIxMailAccountActions.m ([WOResponse
|
* UI/MailerUI/UIxMailAccountActions.m ([WOResponse
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
else if ([realEncoding isEqualToString: @"base64"])
|
else if ([realEncoding isEqualToString: @"base64"])
|
||||||
decodedData = [self dataByDecodingBase64];
|
decodedData = [self dataByDecodingBase64];
|
||||||
else if ([realEncoding isEqualToString: @"quoted-printable"])
|
else if ([realEncoding isEqualToString: @"quoted-printable"])
|
||||||
decodedData = [self dataByDecodingQuotedPrintable];
|
decodedData = [self dataByDecodingQuotedPrintableTransferEncoding];
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
decodedData = nil;
|
decodedData = nil;
|
||||||
|
|
|
@ -112,6 +112,7 @@
|
||||||
return flatContent;
|
return flatContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#warning we should use NSData+Mail's bodyDataFromEncoding: instead
|
||||||
- (NSData *) decodedFlatContent
|
- (NSData *) decodedFlatContent
|
||||||
{
|
{
|
||||||
NSString *enc;
|
NSString *enc;
|
||||||
|
@ -128,7 +129,7 @@
|
||||||
return [[self flatContent] dataByDecodingBase64];
|
return [[self flatContent] dataByDecodingBase64];
|
||||||
|
|
||||||
if ([enc isEqualToString:@"quoted-printable"])
|
if ([enc isEqualToString:@"quoted-printable"])
|
||||||
return [[self flatContent] dataByDecodingQuotedPrintable];
|
return [[self flatContent] dataByDecodingQuotedPrintableTransferEncoding];
|
||||||
|
|
||||||
[self errorWithFormat:@"unsupported MIME encoding: %@", enc];
|
[self errorWithFormat:@"unsupported MIME encoding: %@", enc];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue