Add signature verification of PGP/MIME-signed parts with --verify.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 5d72b1fd71022ae52c579e6c2734d7c0a6e190bd..99bb15fce57642c777b6184c917a0e0c8ca5adfe 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -25,46 +25,23 @@
 #include "gmime-filter-headers.h"
 
 static void
-reply_part (GMimeObject *part,
-           unused (int *part_count));
+reply_part_content (GMimeObject *part);
 
 static const notmuch_show_format_t format_reply = {
-    NULL,
-       NULL, NULL,
-           NULL, NULL, NULL,
-           NULL, reply_part, NULL, NULL, NULL,
-       NULL, NULL,
-    NULL
+    "",
+       "", NULL,
+           "", NULL, "",
+           "",
+               NULL,
+               NULL,
+               reply_part_content,
+               NULL,
+               "",
+           "",
+       "", "",
+    ""
 };
 
-static void
-reply_part_content (GMimeObject *part)
-{
-    GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
-    GMimeDataWrapper *wrapper;
-    const char *charset;
-
-    charset = g_mime_object_get_content_type_parameter (part, "charset");
-    stream_stdout = g_mime_stream_file_new (stdout);
-    if (stream_stdout) {
-       g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
-       stream_filter = g_mime_stream_filter_new(stream_stdout);
-        if (charset) {
-          g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
-                                   g_mime_filter_charset_new(charset, "UTF-8"));
-        }
-    }
-    g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
-                            g_mime_filter_reply_new(TRUE));
-    wrapper = g_mime_part_get_content_object (GMIME_PART (part));
-    if (wrapper && stream_filter)
-       g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
-    if (stream_filter)
-       g_object_unref(stream_filter);
-    if (stream_stdout)
-       g_object_unref(stream_stdout);
-}
-
 static void
 show_reply_headers (GMimeMessage *message)
 {
@@ -85,8 +62,7 @@ show_reply_headers (GMimeMessage *message)
 }
 
 static void
-reply_part (GMimeObject *part,
-           unused (int *part_count))
+reply_part_content (GMimeObject *part)
 {
     GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
     GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
@@ -94,7 +70,29 @@ reply_part (GMimeObject *part,
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
        !g_mime_content_type_is_type (content_type, "text", "html"))
     {
-       reply_part_content (part);
+       GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+       GMimeDataWrapper *wrapper;
+       const char *charset;
+
+       charset = g_mime_object_get_content_type_parameter (part, "charset");
+       stream_stdout = g_mime_stream_file_new (stdout);
+       if (stream_stdout) {
+           g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+           stream_filter = g_mime_stream_filter_new(stream_stdout);
+           if (charset) {
+               g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+                                        g_mime_filter_charset_new(charset, "UTF-8"));
+           }
+       }
+       g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+                                g_mime_filter_reply_new(TRUE));
+       wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+       if (wrapper && stream_filter)
+           g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
+       if (stream_filter)
+           g_object_unref(stream_filter);
+       if (stream_stdout)
+           g_object_unref(stream_stdout);
     }
     else
     {
@@ -450,6 +448,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
     const notmuch_show_format_t *format = &format_reply;
     notmuch_show_params_t params;
     params.part = -1;
+    params.cryptoctx = NULL;
 
     for (messages = notmuch_query_search_messages (query);
         notmuch_messages_valid (messages);