diff options
Diffstat (limited to 'mail/mail-preferences.c')
| -rw-r--r-- | mail/mail-preferences.c | 7 |
1 files changed, 3 insertions, 4 deletions
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); |