X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=20e54bcd0f0a6d665720dbc6354d2824ebdcfe09;hp=8f485eff7248f076de99228946f57ec3f16e81ea;hb=04927208fa10cfa33d2ca93dfcb5ac95f25f55a1;hpb=362ab047c264ae67ec3de041aec637979077db21

diff --git a/notmuch-show.c b/notmuch-show.c
index 8f485eff..20e54bcd 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -20,26 +20,6 @@
 
 #include "notmuch-client.h"
 
-typedef struct show_format {
-    const char *message_set_start;
-    const char *message_start;
-    void (*message) (const void *ctx,
-		     notmuch_message_t *message,
-		     int indent);
-    const char *header_start;
-    void (*header) (const void *ctx,
-		    notmuch_message_t *message);
-    const char *header_end;
-    const char *body_start;
-    void (*part) (GMimeObject *part,
-		  int *part_count, int first);
-    void (*part_end) (GMimeObject *part);
-    const char *body_end;
-    const char *message_end;
-    const char *message_set_sep;
-    const char *message_set_end;
-} show_format_t;
-
 static void
 format_message_text (unused (const void *ctx),
 		     notmuch_message_t *message,
@@ -56,7 +36,7 @@ format_part_text (GMimeObject *part,
 static void
 format_part_end_text (GMimeObject *part);
 
-static const show_format_t format_text = {
+static const notmuch_show_format_t format_text = {
     "",
 	"\fmessage{ ", format_message_text,
 	    "\fheader{\n", format_headers_text, "\fheader}\n",
@@ -81,7 +61,7 @@ format_part_json (GMimeObject *part,
 static void
 format_part_end_json (GMimeObject *part);
 
-static const show_format_t format_json = {
+static const notmuch_show_format_t format_json = {
     "[",
 	"{", format_message_json,
 	    ", \"headers\": {", format_headers_json, "}",
@@ -95,7 +75,7 @@ format_message_mbox (const void *ctx,
 		     notmuch_message_t *message,
 		     unused (int indent));
 
-static const show_format_t format_mbox = {
+static const notmuch_show_format_t format_mbox = {
     "",
         "", format_message_mbox,
             "", NULL, "",
@@ -458,6 +438,7 @@ format_part_json (GMimeObject *part, int *part_count, int first)
     void *ctx = talloc_new (NULL);
     GMimeStream *stream_memory = g_mime_stream_mem_new ();
     GByteArray *part_content;
+    const char *cid;
 
     content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
 
@@ -468,6 +449,11 @@ format_part_json (GMimeObject *part, int *part_count, int first)
 	    *part_count,
 	    json_quote_str (ctx, g_mime_content_type_to_string (content_type)));
 
+    cid = g_mime_object_get_content_id (part);
+    if (cid != NULL)
+	    printf(", \"content-id\": %s",
+		   json_quote_str (ctx, cid));
+
     disposition = g_mime_object_get_content_disposition (part);
     if (disposition &&
 	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
@@ -509,7 +495,10 @@ format_part_end_json (GMimeObject *part)
 }
 
 static void
-show_message (void *ctx, const show_format_t *format, notmuch_message_t *message, int indent)
+show_message (void *ctx,
+	      const notmuch_show_format_t *format,
+	      notmuch_message_t *message,
+	      int indent)
 {
     fputs (format->message_start, stdout);
     if (format->message)
@@ -523,7 +512,7 @@ show_message (void *ctx, const show_format_t *format, notmuch_message_t *message
     fputs (format->body_start, stdout);
     if (format->part)
 	show_message_body (notmuch_message_get_filename (message),
-			   format->part, format->part_end);
+			   format);
     fputs (format->body_end, stdout);
 
     fputs (format->message_end, stdout);
@@ -531,7 +520,10 @@ show_message (void *ctx, const show_format_t *format, notmuch_message_t *message
 
 
 static void
-show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messages, int indent,
+show_messages (void *ctx,
+	       const notmuch_show_format_t *format,
+	       notmuch_messages_t *messages,
+	       int indent,
 	       notmuch_bool_t entire_thread)
 {
     notmuch_message_t *message;
@@ -625,7 +617,7 @@ do_show_raw (unused(void *ctx), notmuch_query_t *query)
 static int
 do_show (void *ctx,
 	 notmuch_query_t *query,
-	 const show_format_t *format,
+	 const notmuch_show_format_t *format,
 	 int entire_thread)
 {
     notmuch_threads_t *threads;
@@ -670,7 +662,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_query_t *query;
     char *query_string;
     char *opt;
-    const show_format_t *format = &format_text;
+    const notmuch_show_format_t *format = &format_text;
     int entire_thread = 0;
     int i;
     int raw = 0;