From 41f1a39d589c9747c0b0517ec1e2d881c3a450f0 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast 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 * 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-preferences.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mail/mail-preferences.c') 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 +#include #include #include "widgets/misc/e-charset-picker.h" #include -#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); -- cgit v1.2.3