diff options
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r-- | composer/e-msg-composer.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index e548bc7001..cf4a130d52 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -242,8 +242,14 @@ composer_get_default_charset_setting (void) gconf = gconf_client_get_default (); buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL); - if (buf == NULL) + if (buf == NULL || buf[0] == '\0') { + g_free (buf); buf = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL); + if (buf && buf[0] == '\0') { + g_free (buf); + buf = NULL; + } + } g_object_unref (gconf); |