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

* mu-msg-part: better detection of message body

Browse Source
This commit is contained in:
djcb
2012-07-24 23:38:37 +03:00
parent a3b4edf56a
commit 8f6cf28f2d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,6 @@ init_msg_part_from_mime_message_part (GMimeMessage *mmsg, MuMsgPart *pi)
} }
static void static void
msg_part_free (MuMsgPart *pi) msg_part_free (MuMsgPart *pi)
{ {
@ -347,15 +346,19 @@ part_foreach_cb (GMimeObject *parent, GMimeObject *mobj, PartData *pdata)
memset (&pi, 0, sizeof(pi)); memset (&pi, 0, sizeof(pi));
pi.index = pdata->_idx++; pi.index = pdata->_idx++;
pi.content_id = (char*)g_mime_object_get_content_id (mobj); pi.content_id = (char*)g_mime_object_get_content_id (mobj);
/* check if this is the body part */
if ((void*)pdata->_body_part == (void*)mobj)
pi.part_type |= MU_MSG_PART_TYPE_BODY;
if (GMIME_IS_PART(mobj)) { if (GMIME_IS_PART(mobj)) {
pi.data = (gpointer)mobj; pi.data = (gpointer)mobj;
rv = init_msg_part_from_mime_part rv = init_msg_part_from_mime_part
(pdata->_opts, parent, (GMimePart*)mobj, &pi); (pdata->_opts, parent, (GMimePart*)mobj, &pi);
/* check if this is the body part */
if ((void*)pdata->_body_part == (void*)mobj)
pi.part_type |= MU_MSG_PART_TYPE_BODY;
} else if (GMIME_IS_MESSAGE_PART(mobj)) { } else if (GMIME_IS_MESSAGE_PART(mobj)) {
GMimeMessage *mmsg; GMimeMessage *mmsg;
mmsg = g_mime_message_part_get_message ((GMimeMessagePart*)mobj); mmsg = g_mime_message_part_get_message ((GMimeMessagePart*)mobj);
if (!mmsg) if (!mmsg)
@ -363,6 +366,7 @@ part_foreach_cb (GMimeObject *parent, GMimeObject *mobj, PartData *pdata)
/* use the message, not the message part */ /* use the message, not the message part */
pi.data = (gpointer)mmsg; pi.data = (gpointer)mmsg;
rv = init_msg_part_from_mime_message_part (mmsg, &pi); rv = init_msg_part_from_mime_message_part (mmsg, &pi);
} else } else
rv = FALSE; /* ignore */ rv = FALSE; /* ignore */