Previously, top-level message headers were printed as Subject, From,
To, Date, while embedded message headers were printed From, To,
Subject, Date. This makes both cases use the former order and updates
the tests accordingly.
Strangely, the raw format also uses this function, so this also fixes
the two raw format tests affected by this change.
---
notmuch-show.c |2 +-
test/multipart | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index d14dac9..ecadfa8 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -360,6 +360,7 @@ format_headers_message_part_text (GMimeMessage *message)
InternetAddressList *recipients;
const char *recipients_string;
+printf (Subject: %s\n, g_mime_message_get_subject (message));
printf (From: %s\n, g_mime_message_get_sender (message));
recipients = g_mime_message_get_recipients (message,
GMIME_RECIPIENT_TYPE_TO);
recipients_string = internet_address_list_to_string (recipients, 0);
@@ -371,7 +372,6 @@ format_headers_message_part_text (GMimeMessage *message)
if (recipients_string)
printf (Cc: %s\n,
recipients_string);
-printf (Subject: %s\n, g_mime_message_get_subject (message));
printf (Date: %s\n, g_mime_message_get_date_as_string (message));
}
diff --git a/test/multipart b/test/multipart
index f83526b..2dd73f5 100755
--- a/test/multipart
+++ b/test/multipart
@@ -121,9 +121,9 @@ Date: Fri, 05 Jan 2001 15:43:57 +
part{ ID: 2, Content-type: multipart/mixed
part{ ID: 3, Content-type: message/rfc822
header{
+Subject: html message
From: Carl Worth cwo...@cworth.org
To: cwo...@cworth.org
-Subject: html message
Date: Fri, 05 Jan 2001 15:42:57 +
header}
body{
@@ -162,9 +162,9 @@ cat EOF EXPECTED
part{ ID: 2, Content-type: multipart/mixed
part{ ID: 3, Content-type: message/rfc822
header{
+Subject: html message
From: Carl Worth cwo...@cworth.org
To: cwo...@cworth.org
-Subject: html message
Date: Fri, 05 Jan 2001 15:42:57 +
header}
body{
@@ -200,9 +200,9 @@ cat EOF EXPECTED
part{ ID: 2, Content-type: multipart/mixed
part{ ID: 3, Content-type: message/rfc822
header{
+Subject: html message
From: Carl Worth cwo...@cworth.org
To: cwo...@cworth.org
-Subject: html message
Date: Fri, 05 Jan 2001 15:42:57 +
header}
body{
@@ -233,9 +233,9 @@ notmuch show --format=text --part=3
'id:87liy5ap00@yoom.home.cworth.org' OU
cat EOF EXPECTED
part{ ID: 3, Content-type: message/rfc822
header{
+Subject: html message
From: Carl Worth cwo...@cworth.org
To: cwo...@cworth.org
-Subject: html message
Date: Fri, 05 Jan 2001 15:42:57 +
header}
body{
@@ -452,9 +452,9 @@ notmuch show --format=raw --part=1
'id:87liy5ap00@yoom.home.cworth.org' OUT
# output should *not* include newline
echo OUTPUT
cat EOF EXPECTED
+Subject: html message
From: Carl Worth cwo...@cworth.org
To: cwo...@cworth.org
-Subject: html message
Date: Fri, 05 Jan 2001 15:42:57 +
pThis is an embedded message, with a multipart/alternative part./p
@@ -476,9 +476,9 @@ test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest --format=raw --part=2, multipart/mixed
notmuch show --format=raw --part=2 'id:87liy5ap00@yoom.home.cworth.org'
OUTPUT
cat EOF EXPECTED
+Subject: html message
From: Carl Worth cwo...@cworth.org
To: cwo...@cworth.org
-Subject: html message
Date: Fri, 05 Jan 2001 15:42:57 +
pThis is an embedded message, with a multipart/alternative part./p
--
1.7.7.3
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
