From 133425e598da03a0107d109d52fbb64aad56e6cf Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 15 Dec 2009 00:05:06 +0000
Subject: [PATCH] See ChangeLog

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

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-12-15T00:05:06
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                  |  7 +++++++
 UI/MailPartViewers/UIxMailPartHTMLViewer.m | 23 ++++++++++------------
 UI/MailPartViewers/UIxMailPartViewer.m     |  5 ++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee249af5d..996b13ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
+	Dropped the use of NGMimeType and we now use
+	the same string decoding method as used
+	for text/plain parts.
+
 2009-12-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tools/SOGoToolRemoveDoubles.m (-processFolder:ofUser:withFoM:):
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 7debb5d38..840480683 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -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];
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index 99c8c4ea9..328c610cc 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -162,9 +162,8 @@
 - (NSString *) flatContentAsString
 {
   /* Note: we even have the line count in the body-info! */
-  NSString *charset;
-  NSString *s;
-  NSData   *content;
+  NSString *s, *charset;
+  NSData *content;
 
   content = [self decodedFlatContent];
   if (content)