From 4f822eb8e2b1668280a41ce9a962f5f341d2ac99 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 23 Jul 2003 16:45:13 +0000 Subject: Revert my previous changes here too. 2003-07-23 Jeffrey Stedfast * 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 --- composer/e-msg-composer-attachment-bar.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'composer/e-msg-composer-attachment-bar.c') diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 05a1b549f3..b1e714ca7e 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -751,7 +751,14 @@ attach_to_multipart (CamelMultipart *multipart, const char *charset; char *type; - charset = header_content_type_param (content_type, "charset"); + /* assume that if a charset is set, that the content is in UTF-8 + * or else already has rawtext set to TRUE */ + if (!(charset = header_content_type_param (content_type, "charset"))) { + /* Let camel know that this text part was read in raw and thus is not in + * UTF-8 format so that when it writes this part out, it doesn't try to + * convert it from UTF-8 into the @default_charset charset. */ + content->rawtext = TRUE; + } stream = camel_stream_null_new (); filter_stream = camel_stream_filter_new_with_stream (stream); -- cgit v1.2.3