From ce15f6d076dda1021a230ff07c701a9e1a97da97 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Tue, 25 Feb 2003 21:18:24 +0000
Subject: Reverted back to using e-iconv instead of camel-iconv.

2003-02-25  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-format.c: Reverted back to using e-iconv instead of
	camel-iconv.

svn path=/trunk/; revision=20060
---
 mail/ChangeLog     | 5 +++++
 mail/mail-format.c | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1e4b8a622a..c41be5ef02 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-25  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-format.c: Reverted back to using e-iconv instead of
+	camel-iconv.
+
 2003-02-25  Dan Winship  <danw@ximian.com>
 
 	* mail-config-druid.c: Update for new EvolutionWizard interfaces.
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 3b15eb04f6..cd83dd2c9b 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -37,7 +37,8 @@
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <shell/e-setup.h>
 
-#include <camel/camel-charset-map.h>
+#include <gal/util/e-iconv.h>
+
 #include <camel/camel-mime-utils.h>
 #include <camel/camel-pgp-mime.h>
 #include <camel/camel-stream-null.h>
@@ -1017,7 +1018,7 @@ write_headers (MailDisplayStream *stream, MailDisplay *md, CamelMimeMessage *mes
 		
 		ct = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));
 		charset = header_content_type_param (ct, "charset");
-		charset = camel_charset_canonical_name (charset);
+		charset = e_iconv_charset_name (charset);
 		
 		header = CAMEL_MIME_PART (message)->headers;
 		while (header) {
-- 
cgit