From 36e3f76a6784b5ab0905043c0d184d09b4d358b1 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Wed, 26 Feb 2003 18:08:52 +0000
Subject: Reverted back to using e-iconv

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

	* mail-preferences.c: Reverted back to using e-iconv

	* mail-composer-preferences.c: Same.

svn path=/trunk/; revision=20071
---
 mail/ChangeLog             | 6 ++++++
 mail/mail-composer-prefs.c | 7 +++----
 mail/mail-preferences.c    | 7 +++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6f53c6446e..cb7ccc5c9e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-26  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-preferences.c: Reverted back to using e-iconv
+
+	* mail-composer-preferences.c: Same.
+
 2003-02-26  Dan Winship  <danw@ximian.com>
 
 	* GNOME_Evolution_Mail.server.in.in: add a repo_id and a priority
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index c6f378d59c..b08fbcba47 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -32,10 +32,9 @@
 
 #include <bonobo/bonobo-generic-factory.h>
 
+#include <gal/util/e-iconv.h>
 #include <gal/widgets/e-gui-utils.h>
 
-#include <camel/camel-charset-map.h>
-
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeselection.h>
@@ -795,7 +794,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 : camel_charset_locale_name ());
+	menu = e_charset_picker_new (buf ? buf : e_iconv_locale_charset ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	option_menu_connect (prefs->charset, prefs);
 	g_free (buf);
@@ -941,7 +940,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 (camel_charset_locale_name ());
+		string = g_strdup (e_iconv_locale_charset ());
 	
 	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/composer/charset", string, NULL);
 	g_free (string);
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c
index fe66fc1f19..7fc9f19e6e 100644
--- a/mail/mail-preferences.c
+++ b/mail/mail-preferences.c
@@ -30,10 +30,9 @@
 #include "mail-preferences.h"
 
 #include <gconf/gconf.h>
-#include <camel/camel-charset-map.h>
+#include <gal/util/e-iconv.h>
 #include <gtkhtml/gtkhtml-properties.h>
 #include "widgets/misc/e-charset-picker.h"
-
 #include <bonobo/bonobo-generic-factory.h>
 
 #include "mail-config.h"
@@ -225,7 +224,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 : camel_charset_locale_name ());
+	menu = e_charset_picker_new (buf ? buf : e_iconv_locale_charset ());
 	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
 	option_menu_connect (prefs->charset, prefs);
 	g_free (buf);
@@ -372,7 +371,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 (camel_charset_locale_name ());
+		string = g_strdup (e_iconv_locale_charset ());
 	
 	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/format/charset", string, NULL);
 	g_free (string);
-- 
cgit v1.2.3