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

show: indicate charset for all omitted parts

Browse source 
Write a "charset" field for all omitted parts for which it is applicable,
not only text/html parts. Factor out the code to a separate function.
It will be extended with more fields next.
This commit is contained in:
Peter Wang 2012-12-16 10:22:50 +11:00 committed by David Bremner
parent ee425ae2ad
commit 35860e00d1
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
notmuch-show.c
View file

@ -599,6 +599,17 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
} }
static void
format_omitted_part_meta_sprinter (sprinter_t *sp, GMimeObject *meta)
{
const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset");
if (content_charset != NULL) {
sp->map_key (sp, "content-charset");
sp->string (sp, content_charset);
}
}
void void
format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
notmuch_bool_t first, notmuch_bool_t output_body) notmuch_bool_t first, notmuch_bool_t output_body)
@ -677,14 +688,9 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
* makes charset decoding the responsibility on the caller, we * makes charset decoding the responsibility on the caller, we
* report the charset for text/html parts. * report the charset for text/html parts.
*/ */
if (g_mime_content_type_is_type (content_type, "text", "html")) { if (g_mime_content_type_is_type (content_type, "text", "*") &&
const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset"); ! g_mime_content_type_is_type (content_type, "text", "html"))
{
if (content_charset != NULL) {
sp->map_key (sp, "content-charset");
sp->string (sp, content_charset);
}
} else if (g_mime_content_type_is_type (content_type, "text", "*")) {
GMimeStream *stream_memory = g_mime_stream_mem_new (); GMimeStream *stream_memory = g_mime_stream_mem_new ();
GByteArray *part_content; GByteArray *part_content;
show_text_part_content (node->part, stream_memory, 0); show_text_part_content (node->part, stream_memory, 0);
@ -692,6 +698,8 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
sp->map_key (sp, "content"); sp->map_key (sp, "content");
sp->string_len (sp, (char *) part_content->data, part_content->len); sp->string_len (sp, (char *) part_content->data, part_content->len);
g_object_unref (stream_memory); g_object_unref (stream_memory);
} else {
format_omitted_part_meta_sprinter (sp, meta);
} }
} else if (GMIME_IS_MULTIPART (node->part)) { } else if (GMIME_IS_MULTIPART (node->part)) {
sp->map_key (sp, "content"); sp->map_key (sp, "content");