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

mu: expose content id to attachment plist

Browse Source
This commit is contained in:
Jun Hao
2016-04-16 22:23:46 +08:00
parent c97591ea0f
commit f998a0ad1e
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,6 +322,15 @@ mu_msg_part_get_filename (MuMsgPart *mpart, gboolean construct_if_needed)
mpart->index, construct_if_needed); mpart->index, construct_if_needed);
} }
const gchar*
mu_msg_part_get_content_id (MuMsgPart *mpart)
{
g_return_val_if_fail (mpart, NULL);
g_return_val_if_fail (GMIME_IS_OBJECT(mpart->data), NULL);
return g_mime_object_get_content_id((GMimeObject*)mpart->data);
}
static MuMsgPartType static MuMsgPartType
get_disposition (GMimeObject *mobj) get_disposition (GMimeObject *mobj)

11
lib/mu-msg-part.h
View File

@ -114,6 +114,17 @@ char *mu_msg_part_get_filename (MuMsgPart *mpart, gboolean construct_if_needed)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
/**
* get appropriate content id for the mime-part
*
* @param mpart a MuMsgPart
*
* @return const content id
*/
const gchar*
mu_msg_part_get_content_id (MuMsgPart *mpart)
G_GNUC_WARN_UNUSED_RESULT;
/** /**
* get the text in the MuMsgPart (ie. in its GMimePart) * get the text in the MuMsgPart (ie. in its GMimePart)
* *

7
lib/mu-msg-sexp.c
View File

@ -354,16 +354,17 @@ static void
each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo) each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo)
{ {
char *name, *tmp, *parttype; char *name, *tmp, *parttype;
char *tmpfile; char *tmpfile, *cid;
name = mu_msg_part_get_filename (part, TRUE); name = mu_msg_part_get_filename (part, TRUE);
tmpfile = get_temp_file_maybe (msg, part, pinfo->opts); tmpfile = get_temp_file_maybe (msg, part, pinfo->opts);
parttype = get_part_type_string (part->part_type); parttype = get_part_type_string (part->part_type);
cid = mu_str_escape_c_literal(mu_msg_part_get_content_id(part), TRUE);
tmp = g_strdup_printf tmp = g_strdup_printf
("%s(:index %d :name \"%s\" :mime-type \"%s/%s\"%s%s " ("%s(:index %d :name \"%s\" :mime-type \"%s/%s\"%s%s "
":type %s " ":type %s "
":attachment %s :size %i %s %s)", ":attachment %s %s%s :size %i %s %s)",
pinfo->parts ? pinfo->parts: "", pinfo->parts ? pinfo->parts: "",
part->index, part->index,
name ? mu_str_escape_c_literal(name, FALSE) : "noname", name ? mu_str_escape_c_literal(name, FALSE) : "noname",
@ -372,6 +373,7 @@ each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo)
tmpfile ? " :temp" : "", tmpfile ? tmpfile : "", tmpfile ? " :temp" : "", tmpfile ? tmpfile : "",
parttype, parttype,
mu_msg_part_maybe_attachment (part) ? "t" : "nil", mu_msg_part_maybe_attachment (part) ? "t" : "nil",
cid ? " :cid" : "", cid ? cid : "",
(int)part->size, (int)part->size,
sig_verdict (part), sig_verdict (part),
dec_verdict (part)); dec_verdict (part));
@ -379,6 +381,7 @@ each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo)
g_free (name); g_free (name);
g_free (tmpfile); g_free (tmpfile);
g_free (parttype); g_free (parttype);
g_free (cid);
g_free (pinfo->parts); g_free (pinfo->parts);
pinfo->parts = tmp; pinfo->parts = tmp;