diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2003-07-24 00:45:13 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-07-24 00:45:13 +0800 |
commit | 4f822eb8e2b1668280a41ce9a962f5f341d2ac99 (patch) | |
tree | 5cb27c0376700b90d92d961ee85620546d0975c7 /composer/e-msg-composer.c | |
parent | 8290ca88493ab6265389b17a75e13cbbeaeb20f9 (diff) | |
download | gsoc2013-evolution-4f822eb8e2b1668280a41ce9a962f5f341d2ac99.tar.gz gsoc2013-evolution-4f822eb8e2b1668280a41ce9a962f5f341d2ac99.tar.zst gsoc2013-evolution-4f822eb8e2b1668280a41ce9a962f5f341d2ac99.zip |
Revert my previous changes here too.
2003-07-23 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment-bar.c (attach_to_multipart): Revert my
previous changes here too.
* e-msg-composer.c (build_message): Revert my previous changes.
svn path=/trunk/; revision=21918
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r-- | composer/e-msg-composer.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 3e128129e7..31cddb46b1 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -404,22 +404,10 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data) 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; - - filter_stream = camel_stream_filter_new_with_stream (stream); - camel_object_unref (stream); - - stream = (CamelStream *) filter_stream; - filter = camel_mime_filter_charset_new_convert ("UTF-8", charset); - camel_stream_filter_add (filter_stream, (CamelMimeFilter *) filter); - camel_object_unref (filter); - } - /* construct the content object */ plain = camel_data_wrapper_new (); + plain->rawtext = FALSE; + camel_data_wrapper_construct_from_stream (plain, stream); camel_object_unref (stream); @@ -448,6 +436,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data) } html = camel_data_wrapper_new (); + html->rawtext = FALSE; stream = camel_stream_mem_new_with_byte_array (data); camel_data_wrapper_construct_from_stream (html, stream); |