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

4 files changed, 23 insertions, 9 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1ff63f46f5..e040fc3adf 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,17 @@
+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.
+
 2003-02-20  Dan Winship  <danw@ximian.com>
 
 	* Makefile.am (libevolution_mail_la_LIBADD):
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index 7d6e56eba6..74c0b48d77 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -33,7 +33,8 @@
 #include <bonobo/bonobo-generic-factory.h>
 
 #include <gal/widgets/e-gui-utils.h>
-#include <gal/util/e-iconv.h>
+
+#include <camel/camel-charset-map.h>
 
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
@@ -787,7 +788,7 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	
 	prefs->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
 	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/composer/charset", NULL);
-	menu = e_charset_picker_new (buf ? buf : e_iconv_locale_charset ());
+	menu = e_charset_picker_new (buf ? buf : camel_charset_locale_name ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	option_menu_connect (prefs->charset, prefs);
 	g_free (buf);
@@ -933,7 +934,7 @@ mail_composer_prefs_apply (MailComposerPrefs *prefs)
 	
 	menu = gtk_option_menu_get_menu (prefs->charset);
 	if (!(string = e_charset_picker_get_charset (menu)))
-		string = g_strdup (e_iconv_locale_charset ());
+		string = g_strdup (camel_charset_locale_name ());
 	
 	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/composer/charset", string, NULL);
 	g_free (string);
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) {
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c
index 60638fff93..be582a8a70 100644
--- a/mail/mail-preferences.c
+++ b/mail/mail-preferences.c
@@ -30,13 +30,12 @@
 #include "mail-preferences.h"
 
 #include <gconf/gconf.h>
+#include <camel/camel-charset-map.h>
 #include <gtkhtml/gtkhtml-properties.h>
 #include "widgets/misc/e-charset-picker.h"
 
 #include <bonobo/bonobo-generic-factory.h>
 
-#include "gal/util/e-iconv.h"
-
 #include "mail-config.h"
 
 
@@ -226,7 +225,7 @@ mail_preferences_construct (MailPreferences *prefs)
 	
 	prefs->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
 	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/format/charset", NULL);
-	menu = e_charset_picker_new (buf ? buf : e_iconv_locale_charset ());
+	menu = e_charset_picker_new (buf ? buf : camel_charset_locale_name ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	option_menu_connect (prefs->charset, prefs);
 	g_free (buf);
@@ -373,7 +372,7 @@ mail_preferences_apply (MailPreferences *prefs)
 	
 	menu = gtk_option_menu_get_menu (prefs->charset);
 	if (!(string = e_charset_picker_get_charset (menu)))
-		string = g_strdup (e_iconv_locale_charset ());
+		string = g_strdup (camel_charset_locale_name ());
 	
 	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/format/charset", string, NULL);
 	g_free (string);