amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-10 17:31:23 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 107bfcafb94e725ae14c9e2bceacbf8399ae6958
Monotone-Revision: 80091501b42618d93c33de4da16ce798fd5915f3

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-12-15T00:05:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2009-12-15 00:05:06 +00:00
parent 7fd62cf7c4
commit 133425e598
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
UI/MailPartViewers/UIxMailPartHTMLViewer.m
View File

@@ -32,6 +32,7 @@
#import <SaxObjC/SaxXMLReader.h>
#import <SaxObjC/SaxXMLReaderFactory.h>
#import <NGExtensions/NSString+misc.h>
#import <NGExtensions/NSString+Encoding.h>
#import <NGObjWeb/SoObjects.h>
#include <libxml/encoding.h>
@@ -39,8 +40,6 @@
#import <SoObjects/Mailer/SOGoMailObject.h>
#import <SoObjects/Mailer/SOGoMailBodyPart.h>
#import <NGMime/NGMimeType.h>
#import "UIxMailPartHTMLViewer.h"
#if 0
@@ -76,11 +75,13 @@ _xmlCharsetForCharset (NSString *charset)
{ @"iso-8859-7", XML_CHAR_ENCODING_8859_7},
{ @"iso-8859-8", XML_CHAR_ENCODING_8859_8},
{ @"iso-8859-9", XML_CHAR_ENCODING_8859_9},
{ @"iso-8859-13", XML_CHAR_ENCODING_ERROR},
{ @"iso-2022-jp", XML_CHAR_ENCODING_2022_JP},
// { @"iso-2022-jp", XML_CHAR_ENCODING_SHIFT_JIS},
{ @"koi8-r", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger koi8-r -> utf8 conversion
{ @"windows-1250", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1250 -> utf8 conversion
{ @"windows-1251", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1251 -> utf8 conversion
{ @"windows-1257", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1257 -> utf8 conversion
{ @"euc-jp", XML_CHAR_ENCODING_EUC_JP}};
unsigned count;
xmlCharEncoding encoding;
@@ -597,12 +598,10 @@ _xmlCharsetForCharset (NSString *charset)
{
NSString *s;
s = [[NSString alloc] initWithData: preparsedContent
encoding: [NGMimeType stringEncodingForCharset:
[[bodyInfo objectForKey:@"parameterList"]
objectForKey: @"charset"]]];
[s autorelease];
s = [NSString stringWithData: preparsedContent
usingEncodingNamed: [[bodyInfo objectForKey:@"parameterList"]
objectForKey: @"charset"]];
#if BYTE_ORDER == BIG_ENDIAN
preparsedContent = [s dataUsingEncoding: NSUTF16BigEndianStringEncoding];
enc = XML_CHAR_ENCODING_UTF16BE;
@@ -707,11 +706,9 @@ _xmlCharsetForCharset (NSString *charset)
{
NSString *s;
s = [[NSString alloc] initWithData: preparsedContent
encoding: [NGMimeType stringEncodingForCharset:
[[bodyInfo objectForKey:@"parameterList"]
objectForKey: @"charset"]]];
[s autorelease];
s = [NSString stringWithData: preparsedContent
usingEncodingNamed: [[bodyInfo objectForKey:@"parameterList"]
objectForKey: @"charset"]];
#if BYTE_ORDER == BIG_ENDIAN
preparsedContent = [s dataUsingEncoding: NSUTF16BigEndianStringEncoding];