callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Same as below.

Browse Source 
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
This commit is contained in:
Jeffrey Stedfast
2003-09-24 20:08:15 +00:00
committed by Jeffrey Stedfast
parent 335cc4fad6
commit 6ddd4506fe
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mail/ChangeLog
View File

@ -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)

2
mail/mail-composer-prefs.c
View File

@ -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);

2
mail/mail-preferences.c
View File

@ -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);