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

* lib: fix body layout

Browse Source
This commit is contained in:
djcb
2013-05-15 00:42:33 +03:00
parent cbe595483f
commit f270847182
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,8 @@ append_sexp_attr_list (GString *gstr, const char* elm, const GSList *lst)
} }
static void static void
append_sexp_attr (GString *gstr, const char* elm, const char *str) append_sexp_attr (GString *gstr, const char* elm, const char *str)
{ {
@ -55,7 +57,9 @@ append_sexp_attr (GString *gstr, const char* elm, const char *str)
if (!str || strlen(str) == 0) if (!str || strlen(str) == 0)
return; /* empty: don't include */ return; /* empty: don't include */
utf8 = mu_str_utf8ify (str); utf8 = mu_str_utf8ify (str);
for (cur = utf8; *cur; ++cur) for (cur = utf8; *cur; ++cur)
if (iscntrl(*cur)) if (iscntrl(*cur))
*cur = ' '; *cur = ' ';
@ -68,6 +72,25 @@ append_sexp_attr (GString *gstr, const char* elm, const char *str)
} }
static void
append_sexp_body_attr (GString *gstr, const char* elm, const char *str)
{
gchar *esc;
if (!str || strlen(str) == 0)
return; /* empty: don't include */
esc = mu_str_escape_c_literal (str, TRUE);
g_string_append_printf (gstr, "\t:%s %s\n", elm, esc);
g_free (esc);
}
struct _ContactData { struct _ContactData {
gboolean from, to, cc, bcc, reply_to; gboolean from, to, cc, bcc, reply_to;
GString *gstr; GString *gstr;
@ -397,9 +420,9 @@ append_message_file_parts (GString *gstr, MuMsg *msg, MuMsgOptions opts)
mu_msg_get_references (msg)); mu_msg_get_references (msg));
append_sexp_attr (gstr, "in-reply-to", append_sexp_attr (gstr, "in-reply-to",
mu_msg_get_header (msg, "In-Reply-To")); mu_msg_get_header (msg, "In-Reply-To"));
append_sexp_attr (gstr, "body-txt", append_sexp_body_attr (gstr, "body-txt",
mu_msg_get_body_text(msg, opts)); mu_msg_get_body_text(msg, opts));
append_sexp_attr (gstr, "body-html", append_sexp_body_attr (gstr, "body-html",
mu_msg_get_body_html(msg, opts)); mu_msg_get_body_html(msg, opts));
} }