aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2002-01-11 05:27:37 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-01-11 05:27:37 +0800
commit36563616f7ef544bc1d9569b66046da794359cff (patch)
tree54b90500fdaca645294ef1f043f619dcc324a967
parent22604df27ba9bea6f80dd8ec94cc92e896584fd6 (diff)
downloadgsoc2013-evolution-36563616f7ef544bc1d9569b66046da794359cff.tar.gz
gsoc2013-evolution-36563616f7ef544bc1d9569b66046da794359cff.tar.zst
gsoc2013-evolution-36563616f7ef544bc1d9569b66046da794359cff.zip
get_file_contents(): use charset instead of composer->charset because the composer arg can be NULL.
svn path=/trunk/; revision=15288
-rw-r--r--composer/e-msg-composer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index b76e91d7ba..e958ab60b2 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -697,7 +697,7 @@ get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_h
camel_object_unref (CAMEL_OBJECT (stream));
charset = composer ? composer->charset : mail_config_get_default_charset ();
- charenc = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (composer->charset, "utf-8");
+ charenc = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "utf-8");
camel_stream_filter_add (filtered_stream, charenc);
camel_object_unref (CAMEL_OBJECT (charenc));