--- /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 7831D421189\r
+ for <notmuch@notmuchmail.org>; Sun, 22 Jan 2012 18:31:24 -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 UpZvVFLFdnk6 for <notmuch@notmuchmail.org>;\r
+ Sun, 22 Jan 2012 18:31:23 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 3C65B429E5B\r
+ for <notmuch@notmuchmail.org>; Sun, 22 Jan 2012 18:31:22 -0800 (PST)\r
+X-AuditID: 12074422-b7fd66d0000008f9-79-4f1cc6798df0\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id CE.46.02297.976CC1F4; Sun, 22 Jan 2012 21:31:21 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q0N2VKkE003216; \r
+ Sun, 22 Jan 2012 21:31:20 -0500\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (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 q0N2VJQw001244\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 22 Jan 2012 21:31:20 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1Rp9gl-0001J6-MC; Sun, 22 Jan 2012 21:31:19 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/3] show: Use consistent header ordering in the text\r
+ format\r
+Date: Sun, 22 Jan 2012 21:31:12 -0500\r
+Message-Id: <1327285873-4713-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1327285873-4713-1-git-send-email-amdragon@mit.edu>\r
+References: <1326918507-28033-1-git-send-email-amdragon@mit.edu>\r
+ <1327285873-4713-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrFt5TMbf4PxOPYvrN2cyOzB6PFt1\r
+ izmAMYrLJiU1J7MstUjfLoErY+K7A+wFV2Qq9j7czNbAeFq8i5GTQ0LAROLL/KPMELaYxIV7\r
+ 69m6GLk4hAT2MUp07trJCuFsYJSYt/wkM4Rzn0mid+ZlKGc+o0T3gk2sIP1sAhoS2/YvZwSx\r
+ RQSkJXbenQ0U5+BgFlCT+NOlAmIKC/hLLNgVAFLBIqAq0fXhPthmXgF7icsP10JdoSBxbvU5\r
+ dhCbU8BBYvelE2AThQTKJO5fncA4gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl1TvdzM\r
+ Er3UlNJNjKCgYXdR2sH486DSIUYBDkYlHt6IpTL+QqyJZcWVuYcYJTmYlER5zY4ChfiS8lMq\r
+ MxKLM+KLSnNSiw8xSnAwK4nwOn+W9hfiTUmsrEotyodJSXOwKInzqmu98xMSSE8sSc1OTS1I\r
+ LYLJynBwKEnwfgUZKliUmp5akZaZU4KQZuLgBBnOAzT8EUgNb3FBYm5xZjpE/hSjopQ471+Q\r
+ hABIIqM0D64XFtWvGMWBXhHmfQJSxQNMCHDdr4AGMwEN5siTAhlckoiQkmpgXHLL+4vNgv5d\r
+ zqKHHB5vWBri9OD/PZndtzLsFvhYXXiz+2DWBL2rGfmH/C1ySzbx60ybY/xGgq9iyaNuF7ec\r
+ 9e/smF+apLi36J13sVLOVVhrxa+u2JGrsGCWV213/uMVvlGm9hbLtZtnnKro2sY3cWODnezl\r
+ /4si2UzSJh48futWb3Oxo22mEktxRqKhFnNRcSIAxJgkoMUCAAA=\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: Mon, 23 Jan 2012 02:31:24 -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 7b40568..682aa71 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -364,6 +364,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
+@@ -375,7 +376,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