debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 11:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch/emacs: Observe the charset of text/html parts, where known.

Browse source 
Add the charset of text/html parts to the JSON output of 'notmuch
-show' when it is known. Observe the encoding when rendering such
parts in emacs.
This commit is contained in:
David Edmondson 2012-01-13 09:44:46 +00:00 committed by David Bremner
parent e40c01bb14
commit 647c250989
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
emacs/notmuch-show.el
View file

@ -328,7 +328,8 @@ message at DEPTH in the current thread."
current buffer, if possible."
(let ((display-buffer (current-buffer)))
(with-temp-buffer
(let ((handle (mm-make-handle (current-buffer) (list content-type))))
(let* ((charset (plist-get part :content-charset))
(handle (mm-make-handle (current-buffer) `(,content-type (charset . ,charset)))))
(if (and (mm-inlinable-p handle)
(mm-inlined-p handle))
(let ((content (notmuch-show-get-bodypart-content msg part nth)))

28
notmuch-show.c
View file

@ -675,13 +675,31 @@ format_part_content_json (GMimeObject *part)
printf (", \"filename\": %s", json_quote_str (ctx, filename));
}
if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html"))
if (g_mime_content_type_is_type (content_type, "text", "*"))
{
show_text_part_content (part, stream_memory);
part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));
/* For non-HTML text/* parts, we include the content in the
* JSON. Since JSON must be Unicode, we handle charset
* decoding here and do not report a charset to the caller.
* For text/html parts, we do not include the content. If a
* caller is interested in text/html parts, it should retrieve
* them separately and they will not be decoded. Since this
* makes charset decoding the responsibility on the caller, we
* report the charset for text/html parts.
*/
if (g_mime_content_type_is_type (content_type, "text", "html"))
{
const char *content_charset = g_mime_object_get_content_type_parameter (GMIME_OBJECT (part), "charset");
printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len));
if (content_charset != NULL)
printf (", \"content-charset\": %s", json_quote_str (ctx, content_charset));
}
else
{
show_text_part_content (part, stream_memory);
part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));
printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len));
}
}
else if (g_mime_content_type_is_type (content_type, "multipart", "*"))
{