diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-09-25 04:08:15 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-09-25 04:08:15 +0800 |
| commit | 6ddd4506fe0d436427257ccd0434c13d716431d1 (patch) | |
| tree | 66b715e4b5125e68c5ed9540f6d857366f5cc962 | |
| parent | 335cc4fad6be19548eb504d893877d1b5adbe9b2 (diff) | |
| download | gsoc2013-evolution-6ddd4506fe0d436427257ccd0434c13d716431d1.tar gsoc2013-evolution-6ddd4506fe0d436427257ccd0434c13d716431d1.tar.gz gsoc2013-evolution-6ddd4506fe0d436427257ccd0434c13d716431d1.tar.bz2 gsoc2013-evolution-6ddd4506fe0d436427257ccd0434c13d716431d1.tar.lz gsoc2013-evolution-6ddd4506fe0d436427257ccd0434c13d716431d1.tar.xz gsoc2013-evolution-6ddd4506fe0d436427257ccd0434c13d716431d1.tar.zst gsoc2013-evolution-6ddd4506fe0d436427257ccd0434c13d716431d1.zip | |
Same as below.
2003-09-24 Jeffrey Stedfast <fejj@ximian.com>
* 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
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-composer-prefs.c | 2 | ||||
| -rw-r--r-- | mail/mail-preferences.c | 2 |
3 files changed, 6 insertions, 2 deletions
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 <fejj@ximian.com> + + * mail-preferences.c (mail_preferences_construct): + 2003-09-23 Jeffrey Stedfast <fejj@ximian.com> * 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); |