From 36e3f76a6784b5ab0905043c0d184d09b4d358b1 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 26 Feb 2003 18:08:52 +0000 Subject: Reverted back to using e-iconv 2003-02-26 Jeffrey Stedfast * mail-preferences.c: Reverted back to using e-iconv * mail-composer-preferences.c: Same. svn path=/trunk/; revision=20071 --- mail/mail-composer-prefs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mail/mail-composer-prefs.c') 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 +#include #include -#include - #include #include #include @@ -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); -- cgit v1.2.3