Improve handling of message/rfc822 parts by adding a new header_message_part function...

[notmuch] / show-message.c

diff --git a/show-message.c b/show-message.c
index 7a4bbc25807981f2772c3eb6916f73a83811345b..d83f04ecc553264bd42b28867e5154c33966b4f2 100644 (file)
--- a/show-message.c
+++ b/show-message.c
@@ -149,9 +149,21 @@ show_message_part (GMimeObject *part,
        if (selected)
            state->in_zone = 1;
 
+       if (selected || (!selected && state->in_zone)) {
+           fputs (format->header_start, stdout);
+           if (format->header_message_part)
+               format->header_message_part (mime_message);
+           fputs (format->header_end, stdout);
+
+           fputs (format->body_start, stdout);
+       }
+
        show_message_part (g_mime_message_get_mime_part (mime_message),
                           state, format, params, TRUE);
 
+       if (selected || (!selected && state->in_zone))
+           fputs (format->body_end, stdout);
+
        if (selected)
            state->in_zone = 0;
     }