alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu4e: unbreak attachments in forwarded messages

Browse Source
This commit is contained in:
djcb
2012-09-25 15:20:26 +03:00
parent ee78475bd8
commit 506f26a342
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mu-msg-part.c
View File

@ -878,15 +878,15 @@ mu_msg_part_maybe_attachment (MuMsgPart *part)
g_return_val_if_fail (part, FALSE);
/* attachments must be leaf parts */
if (!part->part_type && MU_MSG_PART_TYPE_LEAF)
if (!(part->part_type & MU_MSG_PART_TYPE_LEAF))
return FALSE;
/* non-textual inline parts are considered attachments as
/* non-textual parts are considered attachments as
* well */
if (part->part_type & MU_MSG_PART_TYPE_INLINE &&
!(part->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN) &&
!(part->part_type & MU_MSG_PART_TYPE_TEXT_HTML))
return TRUE;
/* if (!(part->part_type & MU_MSG_PART_TYPE_ATTACHMENT) && */
/* !(part->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN) && */
/* !(part->part_type & MU_MSG_PART_TYPE_TEXT_HTML)) */
/* return TRUE; */
return FALSE;
return part->part_type & MU_MSG_PART_TYPE_ATTACHMENT ? TRUE : FALSE;
}

5
mu/mu-cmd-server.c
View File

@ -418,12 +418,11 @@ each_part (MuMsg *msg, MuMsgPart *part, GSList **attlist)
/* exclude things that don't look like proper attachments,
* unless they're images */
if (!mu_msg_part_maybe_attachment(part) ||
g_strcmp0 (part->type, "image") != 0)
if (!mu_msg_part_maybe_attachment(part))
return;
err = NULL;
cachefile = mu_msg_part_save_temp (msg, MU_MSG_OPTION_NONE,
cachefile = mu_msg_part_save_temp (msg, MU_MSG_OPTION_OVERWRITE,
part->index, &err);
if (!cachefile) {
print_and_clear_g_error (&err);