Merge branch '0.3.x' immediately after the 0.3.1 release

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index e317d19855e9eed69483b051a04de4c7749ac62d..26449fa5bd0c2efde1d6f45460ee36cef60ce342 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -145,7 +145,7 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in
     date = notmuch_message_get_date (message);
     relative_date = notmuch_time_relative_date (ctx, date);
 
-    printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"date_unix\": %ld, \"date_relative\": \"%s\", \"tags\": [",
+    printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [",
            json_quote_str (ctx_quote, notmuch_message_get_message_id (message)),
            notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false",
            json_quote_str (ctx_quote, notmuch_message_get_filename (message)),
@@ -326,7 +326,7 @@ format_part_json (GMimeObject *part, int *part_count)
        show_part_content (part, stream_memory);
        part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));
 
-       printf (", \"content\": %s", json_quote_str (ctx, (char *) part_content->data));
+       printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len));
     }
 
     fputs ("}", stdout);