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

Same as with attachment-bar's get_default_charset(). (setup_ui): Instead

Browse Source 
2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_get_default_charset_setting): Same as
	with attachment-bar's get_default_charset().
	(setup_ui): Instead of pulling the default charset from gconf,
	call our helper function above.

	* e-msg-composer-attachment-bar.c (get_default_charset): If gconf
	returns a NULL string, default back to the locale charset.

svn path=/trunk/; revision=20775
This commit is contained in:
Jeffrey Stedfast
2003-04-09 06:06:45 +00:00
committed by Jeffrey Stedfast
parent 17c1d1c0fd
commit 21fd865ec0
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
composer/ChangeLog
View File

@ -1,3 +1,13 @@
2003-04-09 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (composer_get_default_charset_setting): Same as
with attachment-bar's get_default_charset().
(setup_ui): Instead of pulling the default charset from gconf,
call our helper function above.
* e-msg-composer-attachment-bar.c (get_default_charset): If gconf
returns a NULL string, default back to the locale charset.
2003-04-08 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (map_default_cb): Added some debug printfs.

8
composer/e-msg-composer-attachment-bar.c
View File

@ -725,8 +725,12 @@ get_default_charset (void)
gconf = gconf_client_get_default ();
buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
charset = e_iconv_charset_name (buf);
g_free (buf);
if (buf != NULL) {
charset = e_iconv_charset_name (buf);
g_free (buf);
} else
charset = e_iconv_locale_name ();
return charset;
}

9
composer/e-msg-composer.c
View File

@ -243,8 +243,11 @@ composer_get_default_charset_setting (void)
if (buf == NULL)
buf = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
charset = e_iconv_charset_name (buf);
g_free (buf);
if (buf != NULL) {
charset = e_iconv_charset_name (buf);
g_free (buf);
} else
charset = e_iconv_locale_name ();
return charset ? charset : "us-ascii";
}
@ -2092,7 +2095,7 @@ setup_ui (EMsgComposer *composer)
/* Populate the Charset Encoding menu and default it to whatever the user
chose as his default charset in the mailer */
gconf = gconf_client_get_default ();
default_charset = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
default_charset = composer_get_default_charset ();
e_charset_picker_bonobo_ui_populate (composer->uic, "/menu/Edit/EncodingPlaceholder",
default_charset,
menu_changed_charset_cb,