aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index ee4fb4d89d..ae1a797b4b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-11 Dan Winship <danw@ximian.com>
+
+ * e-msg-composer.c (best_charset): Fix again... don't leave
+ *encoding uninitialized in the US-ASCII case.
+
2001-06-11 Jon Trowbridge <trow@ximian.com>
* e-msg-composer.c (e_msg_composer_construct): Rearranged
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index a785be5c2a..f73b8baae6 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -175,7 +175,8 @@ best_charset (GByteArray *buf, CamelMimePartEncodingType *encoding)
{
const char *charset;
- if (best_encoding (buf, "US-ASCII") == CAMEL_MIME_PART_ENCODING_7BIT)
+ *encoding = best_encoding (buf, "US-ASCII");
+ if (*encoding == CAMEL_MIME_PART_ENCODING_7BIT)
return NULL;
charset = mail_config_get_default_charset ();