X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=ab15650827f0a30c0c9aaf89b0734f398e8b5b21;hp=23d04b8b1ea01083de530204bc4b95eeaaf130c5;hb=d32b8b17154c4497e76c704f2decbf86b1f30c6a;hpb=44ea57a0d10ddab514abea319c4d25ec4e36b51e;ds=sidebyside

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 23d04b8b..ab156508 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -24,6 +24,19 @@
 #include "gmime-filter-reply.h"
 #include "gmime-filter-headers.h"
 
+static void
+reply_part (GMimeObject *part,
+	    unused (int *part_count));
+
+static const notmuch_show_format_t format_reply = {
+    NULL,
+	NULL, NULL,
+	    NULL, NULL, NULL,
+	    NULL, reply_part, NULL, NULL, NULL,
+	NULL, NULL,
+    NULL
+};
+
 static void
 reply_part_content (GMimeObject *part)
 {
@@ -72,12 +85,12 @@ show_reply_headers (GMimeMessage *message)
 }
 
 static void
-reply_part (GMimeObject *part, int *part_count)
+reply_part (GMimeObject *part,
+	    unused (int *part_count))
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
 
-    (void) part_count;
     disposition = g_mime_object_get_content_disposition (part);
     if (disposition &&
 	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
@@ -447,6 +460,9 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
     notmuch_message_t *message;
     const char *subject, *from_addr = NULL;
     const char *in_reply_to, *orig_references, *references;
+    const notmuch_show_format_t *format = &format_reply;
+    notmuch_show_params_t params;
+    params.part = -1;
 
     for (messages = notmuch_query_search_messages (query);
 	 notmuch_messages_valid (messages);
@@ -505,7 +521,8 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
 		notmuch_message_get_header (message, "date"),
 		notmuch_message_get_header (message, "from"));
 
-	show_message_body (notmuch_message_get_filename (message), reply_part);
+	show_message_body (notmuch_message_get_filename (message),
+			   format, &params);
 
 	notmuch_message_destroy (message);
     }