diff options
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; } |