From 8a2f94b83502c3e46510efbea1e90325cfa0c9f1 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 21 Jul 2003 17:44:55 +0000 Subject: Make this work again. * e-msg-composer.c (build_message): Make this work again. svn path=/trunk/; revision=21881 --- composer/ChangeLog | 4 ++++ composer/e-msg-composer.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/composer/ChangeLog b/composer/ChangeLog index 323670f41b..7734ae116e 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,7 @@ +2003-07-21 Dan Winship + + * e-msg-composer.c (build_message): Make this work again. + 2003-07-17 Maxx Cao ** For bug #46013 diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index f1e634b809..7e6bf647c1 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -402,14 +402,13 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data) header_content_type_set_param (type, "charset", charset); } - plain = camel_data_wrapper_new (); - + stream = camel_stream_mem_new_with_byte_array (data); + /* convert the stream to the appropriate charset */ if (charset && strcasecmp (charset, "UTF-8") != 0) { CamelStreamFilter *filter_stream; CamelMimeFilterCharset *filter; - stream = camel_stream_mem_new_with_byte_array (data); filter_stream = camel_stream_filter_new_with_stream (stream); camel_object_unref (stream); @@ -420,6 +419,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data) } /* construct the content object */ + plain = camel_data_wrapper_new (); camel_data_wrapper_construct_from_stream (plain, stream); camel_object_unref (stream); -- cgit v1.2.3