aboutsummaryrefslogtreecommitdiffstats
path: root/em-format
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2012-09-11 19:47:17 +0800
committerDan Vrátil <dvratil@redhat.com>2012-09-11 19:47:17 +0800
commitf836b409df8873b773907f8d3c1a1537008e5f9a (patch)
treeffddb31e72927b4495e06ff501508c210c56efa5 /em-format
parentb9068f622c6a0ad1009280a34ec78dea8ef1d6f8 (diff)
downloadgsoc2013-evolution-f836b409df8873b773907f8d3c1a1537008e5f9a.tar
gsoc2013-evolution-f836b409df8873b773907f8d3c1a1537008e5f9a.tar.gz
gsoc2013-evolution-f836b409df8873b773907f8d3c1a1537008e5f9a.tar.bz2
gsoc2013-evolution-f836b409df8873b773907f8d3c1a1537008e5f9a.tar.lz
gsoc2013-evolution-f836b409df8873b773907f8d3c1a1537008e5f9a.tar.xz
gsoc2013-evolution-f836b409df8873b773907f8d3c1a1537008e5f9a.tar.zst
gsoc2013-evolution-f836b409df8873b773907f8d3c1a1537008e5f9a.zip
Don't re-parse attachment parts as attachments
Diffstat (limited to 'em-format')
-rw-r--r--em-format/e-mail-parser-multipart-mixed.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index e00174cc45..c8e2995ffc 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -99,9 +99,11 @@ empe_mp_mixed_parse (EMailParserExtension *extension,
ct = camel_mime_part_get_content_type (subpart);
- /* Display parts with CID as attachments */
+ /* Display parts with CID as attachments (unless they already are
+ * attachments) */
if (new_parts && new_parts->data &&
- (E_MAIL_PART (new_parts->data)->cid != NULL)) {
+ (E_MAIL_PART (new_parts->data)->cid != NULL) &&
+ !E_MAIL_PART (new_parts->data)->is_attachment) {
parts = g_slist_concat (parts,
e_mail_parser_wrap_as_attachment (