[PATCH 3/3] reply: Move reply citation printing to the recursive MIME walk

diff --git a/1c/94b43cd147d0ff2c08df5744b0e7847ea45c56 b/1c/94b43cd147d0ff2c08df5744b0e7847ea45c56
new file mode 100644 (file)
index 0000000..a1e00e2
--- /dev/null
+++ b/1c/94b43cd147d0ff2c08df5744b0e7847ea45c56
@@ -0,0 +1,118 @@
+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 CF27A431FBD\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:13 -0700 (PDT)\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 Awk0kHe92EsB for <notmuch@notmuchmail.org>;\r
+       Thu, 22 Mar 2012 20:34:13 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0CBC9431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:12 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fbf6d0000008ba-eb-4f6bef33c36d\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 0D.F9.02234.33FEB6F4; Thu, 22 Mar 2012 23:34:11 -0400 (EDT)\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 q2N3YBfX027209; \r
+       Thu, 22 Mar 2012 23:34:11 -0400\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 q2N3Y9Xr007971\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Thu, 22 Mar 2012 23:34:10 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1SAvGS-0002PK-R8; Thu, 22 Mar 2012 23:34:08 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] reply: Move reply citation printing to the recursive MIME\r
+       walk\r
+Date: Thu, 22 Mar 2012 23:34:07 -0400\r
+Message-Id: <1332473647-9133-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
+References: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrWv8PtvfYM4HU4vrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEro/H1cpaC8zwV6x/8YG9gnMvVxcjJISFgItF8/isrhC0mceHe\r
+       erYuRi4OIYF9jBL/pm5gB0kICWxglJg4gx0icZ9J4m7zDyYIZz6jxM4br8Ha2QQ0JLbtX84I\r
+       YosISEvsvDsbKM7BwSygJvGnSwXEFBYIlmg5GAtSwSKgKjG5r4UJxOYVsJdYf6iFBeIIBYlz\r
+       q8+B7eUUcJA4+/keI8QN9hJbn3xhn8DIv4CRYRWjbEpulW5uYmZOcWqybnFyYl5eapGukV5u\r
+       ZoleakrpJkZwyEjy7mB8d1DpEKMAB6MSD+8tv2x/IdbEsuLK3EOMkhxMSqK8DO+AQnxJ+SmV\r
+       GYnFGfFFpTmpxYcYJTiYlUR4lZyBcrwpiZVVqUX5MClpDhYlcV5VrXd+QgLpiSWp2ampBalF\r
+       MFkZDg4lCd5gkKGCRanpqRVpmTklCGkmDk6Q4TxAwzNBaniLCxJzizPTIfKnGBWlxHlTQBIC\r
+       IImM0jy4XlhMv2IUB3pFmDcXpIoHmA7gul8BDWYCGjzhWhbI4JJEhJRUAyP/JUdm96K+lonr\r
+       2e4bSB+tNlqp662U8/SB0cLOKxybhb4dmHml26fs6i2uqvk+/uuUnv97bbdsshnbw/rPDv/W\r
+       V7YpzqlLmqwdwPturcT8rOun7NIyIrYJlri0pmmrPtl2T+5J/8RL8efy+r7fPFQg2K/RmhR8\r
+       2rHw0vX1m/Sfv1lz8snKJ05KLMUZiYZazEXFiQAvinOvxAIAAA==\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: Fri, 23 Mar 2012 03:34:14 -0000\r
+\r
+This makes more logical sense, since it makes the recursive printer\r
+responsible for the entire reply body and lets it start at the root of\r
+the MIME tree instead of the first child.  (We could move reply header\r
+creation in there, too, but if we ever support proper reply to\r
+multiple messages, we'll want just one set of reply headers computed\r
+from the entire message set and many bodies.)\r
+---\r
+ notmuch-reply.c |   12 ++++++------\r
+ 1 files changed, 6 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 84a1220..0949d9f 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -47,7 +47,11 @@ format_part_reply (mime_node_t *node)\r
+ {\r
+     int i;\r
+ \r
+-    if (GMIME_IS_MESSAGE (node->part)) {\r
++    if (node->envelope_file) {\r
++      printf ("On %s, %s wrote:\n",\r
++              notmuch_message_get_header (node->envelope_file, "date"),\r
++              notmuch_message_get_header (node->envelope_file, "from"));\r
++    } else if (GMIME_IS_MESSAGE (node->part)) {\r
+       GMimeMessage *message = GMIME_MESSAGE (node->part);\r
+       InternetAddressList *recipients;\r
+       const char *recipients_string;\r
+@@ -540,13 +544,9 @@ notmuch_reply_format_default(void *ctx,\r
+       g_object_unref (G_OBJECT (reply));\r
+       reply = NULL;\r
+ \r
+-      printf ("On %s, %s wrote:\n",\r
+-              notmuch_message_get_header (message, "date"),\r
+-              notmuch_message_get_header (message, "from"));\r
+-\r
+       if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt,\r
+                           &root) == NOTMUCH_STATUS_SUCCESS) {\r
+-          format_part_reply (mime_node_child (root, 0));\r
++          format_part_reply (root);\r
+           talloc_free (root);\r
+       }\r
+ \r
+-- \r
+1.7.7.3\r
+\r