From 6ddd4506fe0d436427257ccd0434c13d716431d1 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 24 Sep 2003 20:08:15 +0000 Subject: Same as below. 2003-09-24 Jeffrey Stedfast * mail-preferences.c (mail_preferences_construct): Same as below. * mail-composer-prefs.c (mail_composer_prefs_construct): gconf can return empty string if the charset has not been set, so if the charset string is empty, default the charset to the user's locale charset. Partial fix for bug #47638. svn path=/trunk/; revision=22690 --- mail/ChangeLog | 4 ++++ mail/mail-composer-prefs.c | 2 +- mail/mail-preferences.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 97dc2f416d..51f9bfe86b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2003-09-24 Jeffrey Stedfast + + * mail-preferences.c (mail_preferences_construct): + 2003-09-23 Jeffrey Stedfast * evolution-mbox-upgrade.c (get_local_store): Don't xmlFree (name) diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c index 3cf3d6e3b3..06e16c4e48 100644 --- a/mail/mail-composer-prefs.c +++ b/mail/mail-composer-prefs.c @@ -841,7 +841,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 ? buf : e_iconv_locale_charset ()); gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu)); option_menu_connect (prefs->charset, prefs); g_free (buf); diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c index 7a3a535028..19b786fb6d 100644 --- a/mail/mail-preferences.c +++ b/mail/mail-preferences.c @@ -240,7 +240,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 ? buf : e_iconv_locale_charset ()); gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu)); option_menu_connect (prefs->charset, prefs); g_free (buf); -- cgit v1.2.3