From 74171b6c897ef057ed7f1fdffebfa0783e55cff1 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Thu, 20 Feb 2003 21:46:51 +0000
Subject: Same as below.

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

	* e-msg-composer.c (composer_get_default_charset_setting): Same as
	below.

	* e-msg-composer-attachment-bar.c (get_default_charset): Use
	camel_charset_canonical_name() rather than e_iconv_charset_name()
	as the latter will be removed shortly.

svn path=/trunk/; revision=19979
---
 composer/ChangeLog                       | 9 +++++++++
 composer/e-msg-composer-attachment-bar.c | 4 ++--
 composer/e-msg-composer.c                | 3 +--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 0fcbb121b7..86bd56162f 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-20  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* e-msg-composer.c (composer_get_default_charset_setting): Same as
+	below.
+
+	* e-msg-composer-attachment-bar.c (get_default_charset): Use
+	camel_charset_canonical_name() rather than e_iconv_charset_name()
+	as the latter will be removed shortly.
+
 2003-02-18  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index a391838df3..425069fbe6 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -31,7 +31,6 @@
 #include <glade/glade.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
-#include <gal/util/e-iconv.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
@@ -45,6 +44,7 @@
 
 #include "e-icon-list.h"
 
+#include "camel/camel-charset-map.h"
 #include "camel/camel-data-wrapper.h"
 #include "camel/camel-stream-fs.h"
 #include "camel/camel-stream-null.h"
@@ -728,7 +728,7 @@ get_default_charset (void)
 	
 	gconf = gconf_client_get_default ();
 	buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
-	charset = e_iconv_charset_name (buf);
+	charset = camel_charset_canonical_name (buf);
 	g_free (buf);
 	
 	return charset;
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5754c8276f..b12b74e840 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -78,7 +78,6 @@
 
 #include <gal/widgets/e-gui-utils.h>
 #include <gal/e-text/e-entry.h>
-#include <gal/util/e-iconv.h>
 
 #include "widgets/misc/e-charset-picker.h"
 
@@ -241,7 +240,7 @@ composer_get_default_charset_setting (void)
 	
 	gconf = gconf_client_get_default ();
 	buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
-	charset = e_iconv_charset_name (buf);
+	charset = camel_charset_canonical_name (buf);
 	g_free (buf);
 	
 	return charset;
-- 
cgit v1.2.3