rename do_show_raw to do_show_single, and create params.raw for raw message output

[notmuch] / show-message.c

diff --git a/show-message.c b/show-message.c
index c206bddc0371d4d6bdebbb9936b2c2531fb71aa0..c5556d81ba466fabe0a5d5bccc26ae347bc18cbb 100644 (file)
--- a/show-message.c
+++ b/show-message.c
@@ -25,24 +25,26 @@
 static void
 show_message_part (GMimeObject *part,
                   int *part_count,
-                  void (*show_part) (GMimeObject *part, int *part_count, int first),
-                  void (*show_part_end) (GMimeObject *part),
+                  const notmuch_show_format_t *format,
                   int first)
 {
+    if (!first)
+       fputs (format->part_sep, stdout);
+
     if (GMIME_IS_MULTIPART (part)) {
        GMimeMultipart *multipart = GMIME_MULTIPART (part);
        int i;
 
        *part_count = *part_count + 1;
-       (*show_part) (part, part_count, first);
+       format->part (part, part_count);
 
        for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
            show_message_part (g_mime_multipart_get_part (multipart, i),
-                              part_count, show_part, show_part_end, i == 0);
+                              part_count, format, i == 0);
        }
 
-       if (show_part_end)
-           (*show_part_end) (part);
+       if (format->part_end)
+           format->part_end (part);
 
        return;
     }
@@ -53,7 +55,7 @@ show_message_part (GMimeObject *part,
        mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
 
        show_message_part (g_mime_message_get_mime_part (mime_message),
-                          part_count, show_part, show_part_end, first);
+                          part_count, format, first);
 
        return;
     }
@@ -66,15 +68,14 @@ show_message_part (GMimeObject *part,
 
     *part_count = *part_count + 1;
 
-    (*show_part) (part, part_count, first);
-    if (show_part_end)
-       (*show_part_end) (part);
+    format->part (part, part_count);
+    if (format->part_end)
+       format->part_end (part);
 }
 
 notmuch_status_t
 show_message_body (const char *filename,
-                  void (*show_part) (GMimeObject *part, int *part_count, int first),
-                  void (*show_part_end) (GMimeObject *part))
+                  const notmuch_show_format_t *format)
 {
     GMimeStream *stream = NULL;
     GMimeParser *parser = NULL;
@@ -98,7 +99,9 @@ show_message_body (const char *filename,
     mime_message = g_mime_parser_construct_message (parser);
 
     show_message_part (g_mime_message_get_mime_part (mime_message),
-                      &part_count, show_part, show_part_end, TRUE);
+                      &part_count,
+                      format,
+                      TRUE);
 
   DONE:
     if (mime_message)
@@ -138,6 +141,8 @@ show_one_part_worker (GMimeObject *part, int *part_count, int desired_part)
        GMimeMultipart *multipart = GMIME_MULTIPART (part);
        int i;
 
+       *part_count = *part_count + 1;
+
        for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
                show_one_part_worker (g_mime_multipart_get_part (multipart, i),
                                      part_count, desired_part);