diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-02-21 05:35:59 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-02-21 05:35:59 +0800 |
| commit | 41f1a39d589c9747c0b0517ec1e2d881c3a450f0 (patch) | |
| tree | 621b81b83add74db9eae7b83f26a9038bef64dc3 /mail/mail-composer-prefs.c | |
| parent | abada7e2cd02933caa7a2643c0771b3ee7a63cfe (diff) | |
| download | gsoc2013-evolution-41f1a39d589c9747c0b0517ec1e2d881c3a450f0.tar.gz gsoc2013-evolution-41f1a39d589c9747c0b0517ec1e2d881c3a450f0.tar.zst gsoc2013-evolution-41f1a39d589c9747c0b0517ec1e2d881c3a450f0.zip | |
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
Diffstat (limited to 'mail/mail-composer-prefs.c')
| -rw-r--r-- | mail/mail-composer-prefs.c | 7 |
1 files changed, 4 insertions, 3 deletions
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); |