aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-05-04 18:03:53 +0800
committerMilan Crha <mcrha@redhat.com>2012-05-04 18:03:53 +0800
commit3cce397e3e7bde2e7bcb55d15405a160756a7a66 (patch)
tree245a2fbb22cb4bfcb4051dfbab62c10dad8d01f7
parent381c91c0d23f717e07da16ab6df56a655b5388b5 (diff)
downloadgsoc2013-evolution-3cce397e3e7bde2e7bcb55d15405a160756a7a66.tar.gz
gsoc2013-evolution-3cce397e3e7bde2e7bcb55d15405a160756a7a66.tar.zst
gsoc2013-evolution-3cce397e3e7bde2e7bcb55d15405a160756a7a66.zip
Bug #669111 - Lost charset in replies to encrypted mails
-rw-r--r--em-format/em-format.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/em-format/em-format.c b/em-format/em-format.c
index becd43f3f7..6b08705d86 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -135,8 +135,14 @@ preserve_charset_in_content_type (CamelMimePart *ipart,
data_wrapper = camel_medium_get_content (CAMEL_MEDIUM (opart));
content_type = camel_data_wrapper_get_mime_type_field (data_wrapper);
+ if (content_type)
+ camel_content_type_set_param (content_type, "charset", charset);
- camel_content_type_set_param (content_type, "charset", charset);
+ /* update charset also on the part itself */
+ data_wrapper = CAMEL_DATA_WRAPPER (opart);
+ content_type = camel_data_wrapper_get_mime_type_field (data_wrapper);
+ if (content_type)
+ camel_content_type_set_param (content_type, "charset", charset);
}
static CamelMimePart *