--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 4AAF5431FD0\r
+ for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 12:28:39 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id KfgHFZBFspG7 for <notmuch@notmuchmail.org>;\r
+ Wed, 18 Jan 2012 12:28:38 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id 0AD9A431FAF\r
+ for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 12:28:37 -0800 (PST)\r
+X-AuditID: 1209190f-b7f8a6d000000914-85-4f172b75da0e\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 88.1D.02324.57B271F4; Wed, 18 Jan 2012 15:28:37 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q0IKSbDI030570; \r
+ Wed, 18 Jan 2012 15:28:37 -0500\r
+Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0IKSZ9F015673\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Wed, 18 Jan 2012 15:28:36 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1Rnc7Y-0007QC-3o; Wed, 18 Jan 2012 15:28:36 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] show: Use consistent header ordering in the text format\r
+Date: Wed, 18 Jan 2012 15:28:26 -0500\r
+Message-Id: <1326918507-28033-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1326918507-28033-1-git-send-email-amdragon@mit.edu>\r
+References: <1326918507-28033-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsUixG6nrluqLe5v8PmAhkVr92cmi6tb+9kt\r
+ mqY7W+zZ52Vx/eZMZgdWj7Pd7awed09zeeycdZfd49b91+wez1bdYg5gjeKySUnNySxLLdK3\r
+ S+DKOHhQtuCKTMXBZYdZGxhPi3cxcnJICJhI3H81mQ3CFpO4cG89kM3FISSwj1Fi08FzzBDO\r
+ BkaJ/3ePsEM4x5kkDs97D1U2n1Fi4eaJrCD9bAIaEtv2L2cEsUUEpCV23p0NFmcWqJV49fcK\r
+ 2A5hAR+JuccmgtWwCKhKNE05DFbDK+Ag8XruIhaIOxQkzq0+xw5icwo4Srz5+xWsXgioZu3P\r
+ vYwTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st0jXRy80s0UtNKd3ECApATkn+HYzfDiod\r
+ YhTgYFTi4Y0UEfcXYk0sK67MPcQoycGkJMpbpQkU4kvKT6nMSCzOiC8qzUktPsQowcGsJML7\r
+ hQ8ox5uSWFmVWpQPk5LmYFES51XTeucnJJCeWJKanZpakFoEk5Xh4FCS4F2jBdQoWJSanlqR\r
+ lplTgpBm4uAEGc4DNHwJSA1vcUFibnFmOkT+FKOilDjvYZCEAEgiozQPrheWIF4xigO9Isy7\r
+ HKSKB5hc4LpfAQ1mAhrs0SQGMrgkESEl1cAoMXneH2m1+o3zFaanTLKWfDfj8LaaxqT+sk3n\r
+ zb/KeXzhvBjw4/tRK+Z0q7acKUs+LGlVmqIt4K90wUDsU5btvuUPj0bZTrBaoS9ov+Q1A2fJ\r
+ 9o4l0yv8/JSuZXzWvKwnO236B84PstUP5kR0FlQc3ew03Vi9oqAx/3LsZyaFl4t44gua+I4o\r
+ sRRnJBpqMRcVJwIAhERr/esCAAA=\r
+Cc: dkg@fifthhorseman.net\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 18 Jan 2012 20:28:39 -0000\r
+\r
+Previously, top-level message headers were printed as Subject, From,\r
+To, Date, while embedded message headers were printed From, To,\r
+Subject, Date. This makes both cases use the former order and updates\r
+the tests accordingly.\r
+\r
+Strangely, the raw format also uses this function, so this also fixes\r
+the two raw format tests affected by this change.\r
+---\r
+ notmuch-show.c | 2 +-\r
+ test/multipart | 12 ++++++------\r
+ 2 files changed, 7 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index d14dac9..ecadfa8 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -360,6 +360,7 @@ format_headers_message_part_text (GMimeMessage *message)\r
+ InternetAddressList *recipients;\r
+ const char *recipients_string;\r
+ \r
++ printf ("Subject: %s\n", g_mime_message_get_subject (message));\r
+ printf ("From: %s\n", g_mime_message_get_sender (message));\r
+ recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
+ recipients_string = internet_address_list_to_string (recipients, 0);\r
+@@ -371,7 +372,6 @@ format_headers_message_part_text (GMimeMessage *message)\r
+ if (recipients_string)\r
+ printf ("Cc: %s\n",\r
+ recipients_string);\r
+- printf ("Subject: %s\n", g_mime_message_get_subject (message));\r
+ printf ("Date: %s\n", g_mime_message_get_date_as_string (message));\r
+ }\r
+ \r
+diff --git a/test/multipart b/test/multipart\r
+index f83526b..2dd73f5 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -121,9 +121,9 @@ Date: Fri, 05 Jan 2001 15:43:57 +0000\r
+ \f\r
+part{ ID: 2, Content-type: multipart/mixed\r
+ \f\r
+part{ ID: 3, Content-type: message/rfc822\r
+ \f\r
+header{\r
++Subject: html message\r
+ From: Carl Worth <cworth@cworth.org>\r
+ To: cworth@cworth.org\r
+-Subject: html message\r
+ Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+@@ -162,9 +162,9 @@ cat <<EOF >EXPECTED\r
+ \f\r
+part{ ID: 2, Content-type: multipart/mixed\r
+ \f\r
+part{ ID: 3, Content-type: message/rfc822\r
+ \f\r
+header{\r
++Subject: html message\r
+ From: Carl Worth <cworth@cworth.org>\r
+ To: cworth@cworth.org\r
+-Subject: html message\r
+ Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+@@ -200,9 +200,9 @@ cat <<EOF >EXPECTED\r
+ \f\r
+part{ ID: 2, Content-type: multipart/mixed\r
+ \f\r
+part{ ID: 3, Content-type: message/rfc822\r
+ \f\r
+header{\r
++Subject: html message\r
+ From: Carl Worth <cworth@cworth.org>\r
+ To: cworth@cworth.org\r
+-Subject: html message\r
+ Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+@@ -233,9 +233,9 @@ notmuch show --format=text --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OU\r
+ cat <<EOF >EXPECTED\r
+ \f\r
+part{ ID: 3, Content-type: message/rfc822\r
+ \f\r
+header{\r
++Subject: html message\r
+ From: Carl Worth <cworth@cworth.org>\r
+ To: cworth@cworth.org\r
+-Subject: html message\r
+ Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+@@ -452,9 +452,9 @@ notmuch show --format=raw --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUT\r
+ # output should *not* include newline\r
+ echo >>OUTPUT\r
+ cat <<EOF >EXPECTED\r
++Subject: html message\r
+ From: Carl Worth <cworth@cworth.org>\r
+ To: cworth@cworth.org\r
+-Subject: html message\r
+ Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+ \r
+ <p>This is an embedded message, with a multipart/alternative part.</p>\r
+@@ -476,9 +476,9 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ test_begin_subtest "--format=raw --part=2, multipart/mixed"\r
+ notmuch show --format=raw --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
+ cat <<EOF >EXPECTED\r
++Subject: html message\r
+ From: Carl Worth <cworth@cworth.org>\r
+ To: cworth@cworth.org\r
+-Subject: html message\r
+ Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+ \r
+ <p>This is an embedded message, with a multipart/alternative part.</p>\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff