NEWS: give a hint about using sort to achieve the old dump behavior.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index f4b1a61b7f34410f5e79a8b82af5aceda15cb41c..7ac879f94419aa4d7783a0cb6d0be8912baad79b 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -93,7 +93,17 @@ 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);
 
-    if (g_mime_content_type_is_type (content_type, "text", "*") &&
+    if (g_mime_content_type_is_type (content_type, "multipart", "*") ||
+       g_mime_content_type_is_type (content_type, "message", "rfc822"))
+    {
+       /* Output nothing, since multipart subparts will be handled individually. */
+    }
+    else if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") ||
+            g_mime_content_type_is_type (content_type, "application", "pgp-signature"))
+    {
+       /* Ignore PGP/MIME cruft parts */
+    }
+    else if (g_mime_content_type_is_type (content_type, "text", "*") &&
        !g_mime_content_type_is_type (content_type, "text", "html"))
     {
        GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
@@ -120,10 +130,6 @@ reply_part_content (GMimeObject *part)
        if (stream_stdout)
            g_object_unref(stream_stdout);
     }
-    else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))
-    {
-       /* Output nothing, since rfc822 subparts will be handled individually. */
-    }
     else
     {
        if (disposition &&
@@ -622,6 +628,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     params.part = -1;
     params.cryptoctx = NULL;
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
            i++;