From 01a47effb04c321e8feac1871a25920ba9cc140c Mon Sep 17 00:00:00 2001 From: djcb Date: Tue, 15 Nov 2016 23:51:38 +0200 Subject: [PATCH] mu: include text-part attachments in body Include text-like attachments parts in the message-body, too --- lib/mu-msg.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/mu-msg.c b/lib/mu-msg.c index ef8951ab..c1b1132d 100644 --- a/lib/mu-msg.c +++ b/lib/mu-msg.c @@ -378,9 +378,9 @@ mu_msg_get_mailing_list (MuMsg *self) { const char *ml; char *decml; - + g_return_val_if_fail (self, NULL); - + ml = get_str_field (self, MU_MSG_FIELD_ID_MAILING_LIST); if (!ml) return NULL; @@ -477,21 +477,20 @@ accumulate_body (MuMsg *msg, MuMsgPart *mpart, BodyData *bdata) char *txt; gboolean err; - /* if it looks like an attachment, skip it */ - if (mpart->part_type & MU_MSG_PART_TYPE_ATTACHMENT) - return; - if (!GMIME_IS_PART(mpart->data)) return; txt = NULL; err = TRUE; + /* text-like attachments are included when in text-mode */ + if (!bdata->want_html && (mpart->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN)) txt = mu_msg_mime_part_to_string ( (GMimePart*)mpart->data, &err); - else if (bdata->want_html && + else if (!(mpart->part_type & MU_MSG_PART_TYPE_ATTACHMENT) && + bdata->want_html && (mpart->part_type & MU_MSG_PART_TYPE_TEXT_HTML)) txt = mu_msg_mime_part_to_string ( (GMimePart*)mpart->data, &err);