mu: include text-part attachments in body

Include text-like attachments parts in the message-body, too
This commit is contained in:
djcb
2016-11-15 23:51:38 +02:00
parent b2cfc02010
commit 01a47effb0

View File

@ -477,21 +477,20 @@ accumulate_body (MuMsg *msg, MuMsgPart *mpart, BodyData *bdata)
char *txt; char *txt;
gboolean err; 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)) if (!GMIME_IS_PART(mpart->data))
return; return;
txt = NULL; txt = NULL;
err = TRUE; err = TRUE;
/* text-like attachments are included when in text-mode */
if (!bdata->want_html && if (!bdata->want_html &&
(mpart->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN)) (mpart->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN))
txt = mu_msg_mime_part_to_string ( txt = mu_msg_mime_part_to_string (
(GMimePart*)mpart->data, &err); (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)) (mpart->part_type & MU_MSG_PART_TYPE_TEXT_HTML))
txt = mu_msg_mime_part_to_string ( txt = mu_msg_mime_part_to_string (
(GMimePart*)mpart->data, &err); (GMimePart*)mpart->data, &err);