From 41f1a39d589c9747c0b0517ec1e2d881c3a450f0 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Thu, 20 Feb 2003 21:35:59 +0000
Subject: Use camel_charset_canonical_name() here instead of
 e_iconv_charset_name().

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

	* mail-format.c (write_headers): Use
	camel_charset_canonical_name() here instead of
	e_iconv_charset_name().

	* mail-preferences.c (mail_preferences_construct): Same as below.
	(mail_preferences_apply): Again here.

	* mail-composer-prefs.c (mail_composer_prefs_construct): Use
	camel_charset_locale_name() here instead of
	e_iconv_locale_charset().
	(mail_composer_prefs_apply): Same.

svn path=/trunk/; revision=19978
---
 mail/mail-format.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mail/mail-format.c')

diff --git a/mail/mail-format.c b/mail/mail-format.c
index 02c9fc6df5..d3e8e1110c 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -35,9 +35,9 @@
 
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <gal/util/e-iconv.h>
 #include <shell/e-setup.h>
 
+#include <camel/camel-charset-map.h>
 #include <camel/camel-mime-utils.h>
 #include <camel/camel-pgp-mime.h>
 #include <camel/camel-stream-null.h>
@@ -1015,7 +1015,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 = e_iconv_charset_name (charset);
+		charset = camel_charset_canonical_name (charset);
 		
 		header = CAMEL_MIME_PART (message)->headers;
 		while (header) {
-- 
cgit v1.2.3