diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-04-09 14:06:45 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-04-09 14:06:45 +0800 |
| commit | 21fd865ec00f00fea2c8be5777348314176d1129 (patch) | |
| tree | a9b6f98666bae4170050e76e44c99e9e5e947a19 /composer/e-msg-composer-attachment-bar.c | |
| parent | 17c1d1c0fd5c9150bb267a0480097cce0679ccaf (diff) | |
| download | gsoc2013-evolution-21fd865ec00f00fea2c8be5777348314176d1129.tar.gz gsoc2013-evolution-21fd865ec00f00fea2c8be5777348314176d1129.tar.zst gsoc2013-evolution-21fd865ec00f00fea2c8be5777348314176d1129.zip | |
Same as with attachment-bar's get_default_charset(). (setup_ui): Instead
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
Diffstat (limited to 'composer/e-msg-composer-attachment-bar.c')
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 0f227b3a1c..14b1244ca3 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -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; } |