--- /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 DB978431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:37 -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 d6AMw5XZ7hBb for <notmuch@notmuchmail.org>;\r
+ Sun, 19 Feb 2012 16:26:36 -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 455AA431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+X-AuditID: 1209190f-b7f8a6d000000914-58-4f41933b1097\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 0E.84.02324.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZRr024835; \r
+ Sun, 19 Feb 2012 19:26:35 -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 q1K0QXd3000301\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 19 Feb 2012 19:26:34 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1RzH5N-0001yI-GQ; Sun, 19 Feb 2012 19:26:33 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/8] show: Use consistent header ordering in the JSON\r
+ format\r
+Date: Sun, 19 Feb 2012 19:26:25 -0500\r
+Message-Id: <1329697590-7404-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+ <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrWs92dHf4MR7Y4vrN2cyW7xZOY/V\r
+ gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mr4cMin4JlmxfLli1gbGD8odzFyckgImEjM\r
+ 3HCREcIWk7hwbz1bFyMXh5DAPkaJzh8/mCGcDYwSd/ZtYIdw7jNJHD/wlhHCmc8oce/wH7B+\r
+ NgENiW37l4PZIgLSEjvvzmYFsZkFrCQOX90EZgsL+EscXbAWzGYRUJX4vGAdkM3BwStgL3H0\r
+ nwPEGQoS51afYwcJcwo4SKze4QoSFhIolTjyZAvTBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT\r
+ 8/JSi3RN9HIzS/RSU0o3MYLDSJJ/B+O3g0qHGAU4GJV4eKXKHPyFWBPLiitzDzFKcjApifKe\r
+ muDoL8SXlJ9SmZFYnBFfVJqTWnyIUYKDWUmEd4E9UI43JbGyKrUoHyYlzcGiJM6rpvXOT0gg\r
+ PbEkNTs1tSC1CCYrw8GhJMHbMAmoUbAoNT21Ii0zpwQhzcTBCTKcB2i4IkgNb3FBYm5xZjpE\r
+ /hSjopQ4rw1IQgAkkVGaB9cLi/NXjOJArwjzpoFU8QBTBFz3K6DBTECDeYXsQAaXJCKkpBoY\r
+ fY++d/sxuX/K8pbtm3Y3si9X8X1hvfE2q2/l1FkMyav3Ox09vLNw2fq+1iauxAbOJXPLovSP\r
+ ta68fH7bq9tTC36UaE1umHeOMUbqeYzpEf5Lt1KWdtec3jbrffOFKXZRd55bTP5j4rD8yrWt\r
+ jQvOOfxiCWKatuDU2pCTGw523zOcoHMnV7VfxliJpTgj0VCLuag4EQAR+q+zzgIAAA==\r
+Cc: tomi.ollila@iki.fi\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, 20 Feb 2012 00:26:38 -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
+ notmuch-show.c | 6 +++---\r
+ test/multipart | 8 ++++----\r
+ 2 files changed, 7 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 868b2cd..9ca9882 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -328,6 +328,9 @@ format_headers_message_part_json (GMimeMessage *message)\r
+ const char *recipients_string;\r
+ \r
+ printf ("%s: %s",\r
++ json_quote_str (ctx_quote, "Subject"),\r
++ json_quote_str (ctx_quote, g_mime_message_get_subject (message)));\r
++ printf (", %s: %s",\r
+ json_quote_str (ctx_quote, "From"),\r
+ json_quote_str (ctx_quote, g_mime_message_get_sender (message)));\r
+ recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
+@@ -343,9 +346,6 @@ format_headers_message_part_json (GMimeMessage *message)\r
+ json_quote_str (ctx_quote, "Cc"),\r
+ json_quote_str (ctx_quote, recipients_string));\r
+ printf (", %s: %s",\r
+- json_quote_str (ctx_quote, "Subject"),\r
+- json_quote_str (ctx_quote, g_mime_message_get_subject (message)));\r
+- printf (", %s: %s",\r
+ json_quote_str (ctx_quote, "Date"),\r
+ json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message)));\r
+ \r
+diff --git a/test/multipart b/test/multipart\r
+index 2dd73f5..4d14804 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -325,7 +325,7 @@ cat <<EOF >EXPECTED\r
+ {"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "${MAIL_DIR}/multipart", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [\r
+ {"id": 1, "content-type": "multipart/signed", "content": [\r
+ {"id": 2, "content-type": "multipart/mixed", "content": [\r
+-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
+ {"id": 4, "content-type": "multipart/alternative", "content": [\r
+ {"id": 5, "content-type": "text/html"}, \r
+ {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, \r
+@@ -342,7 +342,7 @@ cat <<EOF >EXPECTED\r
+ \r
+ {"id": 1, "content-type": "multipart/signed", "content": [\r
+ {"id": 2, "content-type": "multipart/mixed", "content": [\r
+-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
+ {"id": 4, "content-type": "multipart/alternative", "content": [\r
+ {"id": 5, "content-type": "text/html"}, \r
+ {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, \r
+@@ -358,7 +358,7 @@ echo >>OUTPUT # expect *no* newline at end of output\r
+ cat <<EOF >EXPECTED\r
+ \r
+ {"id": 2, "content-type": "multipart/mixed", "content": [\r
+-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
+ {"id": 4, "content-type": "multipart/alternative", "content": [\r
+ {"id": 5, "content-type": "text/html"}, \r
+ {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, \r
+@@ -372,7 +372,7 @@ notmuch show --format=json --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org' | s\r
+ echo >>OUTPUT # expect *no* newline at end of output\r
+ cat <<EOF >EXPECTED\r
+ \r
+-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
+ {"id": 4, "content-type": "multipart/alternative", "content": [\r
+ {"id": 5, "content-type": "text/html"}, \r
+ {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff