X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=show-message.c;h=4ccd449018850c417c5a324b3952e1767389aa4e;hp=b1b61be40c2618fddcc56c46e683e517f9101f7d;hb=ecae541031911b65594c3ec757abb671583e8872;hpb=e2dd4ac00b9979de34bd517fa57de56260d38755

diff --git a/show-message.c b/show-message.c
index b1b61be4..4ccd4490 100644
--- a/show-message.c
+++ b/show-message.c
@@ -23,45 +23,49 @@
 #include "notmuch-client.h"
 
 static void
-show_message_part (GMimeObject *part, int *part_count,
-		   void (*show_part) (GMimeObject *part, int *part_count))
+show_message_part (GMimeObject *part,
+		   int *part_count,
+		   const notmuch_show_format_t *format,
+		   int first)
 {
+    *part_count += 1;
+
+    if (! (GMIME_IS_PART (part) || GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part))) {
+	fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
+		 g_type_name (G_OBJECT_TYPE (part)));
+	return;
+    }
+
+    if (!first)
+	fputs (format->part_sep, stdout);
+
+    format->part (part, part_count);
+
     if (GMIME_IS_MULTIPART (part)) {
 	GMimeMultipart *multipart = GMIME_MULTIPART (part);
 	int i;
 
 	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);
+			       part_count, format, i == 0);
 	}
-	return;
-    }
 
-    if (GMIME_IS_MESSAGE_PART (part)) {
+    } else if (GMIME_IS_MESSAGE_PART (part)) {
 	GMimeMessage *mime_message;
 
 	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);
-
-	return;
-    }
-
-    if (! (GMIME_IS_PART (part))) {
-	fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
-		 g_type_name (G_OBJECT_TYPE (part)));
-	return;
+			   part_count, format, first);
     }
 
-    *part_count = *part_count + 1;
-
-    (*show_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))
+		   const notmuch_show_format_t *format)
 {
     GMimeStream *stream = NULL;
     GMimeParser *parser = NULL;
@@ -85,7 +89,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);
+		       &part_count,
+		       format,
+		       TRUE);
 
   DONE:
     if (mime_message)
@@ -125,6 +131,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);