1c/94b43cd147d0ff2c08df5744b0e7847ea45c56

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id CF27A431FBD\r
   6         for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:13 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id Awk0kHe92EsB for <notmuch@notmuchmail.org>;\r
  16         Thu, 22 Mar 2012 20:34:13 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 0CBC9431FAF\r
  20         for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:12 -0700 (PDT)\r
  21 X-AuditID: 1209190d-b7fbf6d0000008ba-eb-4f6bef33c36d\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 0D.F9.02234.33FEB6F4; Thu, 22 Mar 2012 23:34:11 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q2N3YBfX027209; \r
  27         Thu, 22 Mar 2012 23:34:11 -0400\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2N3Y9Xr007971\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Thu, 22 Mar 2012 23:34:10 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1SAvGS-0002PK-R8; Thu, 22 Mar 2012 23:34:08 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 3/3] reply: Move reply citation printing to the recursive MIME\r
  41         walk\r
  42 Date: Thu, 22 Mar 2012 23:34:07 -0400\r
  43 Message-Id: <1332473647-9133-4-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.7.3\r
  45 In-Reply-To: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrWv8PtvfYM4HU4vrN2cyOzB6PFt1\r
  49         izmAMYrLJiU1J7MstUjfLoEro/H1cpaC8zwV6x/8YG9gnMvVxcjJISFgItF8/isrhC0mceHe\r
  50         erYuRi4OIYF9jBL/pm5gB0kICWxglJg4gx0icZ9J4m7zDyYIZz6jxM4br8Ha2QQ0JLbtX84I\r
  51         YosISEvsvDsbKM7BwSygJvGnSwXEFBYIlmg5GAtSwSKgKjG5r4UJxOYVsJdYf6iFBeIIBYlz\r
  52         q8+B7eUUcJA4+/keI8QN9hJbn3xhn8DIv4CRYRWjbEpulW5uYmZOcWqybnFyYl5eapGukV5u\r
  53         ZoleakrpJkZwyEjy7mB8d1DpEKMAB6MSD+8tv2x/IdbEsuLK3EOMkhxMSqK8DO+AQnxJ+SmV\r
  54         GYnFGfFFpTmpxYcYJTiYlUR4lZyBcrwpiZVVqUX5MClpDhYlcV5VrXd+QgLpiSWp2ampBalF\r
  55         MFkZDg4lCd5gkKGCRanpqRVpmTklCGkmDk6Q4TxAwzNBaniLCxJzizPTIfKnGBWlxHlTQBIC\r
  56         IImM0jy4XlhMv2IUB3pFmDcXpIoHmA7gul8BDWYCGjzhWhbI4JJEhJRUAyP/JUdm96K+lonr\r
  57         2e4bSB+tNlqp662U8/SB0cLOKxybhb4dmHml26fs6i2uqvk+/uuUnv97bbdsshnbw/rPDv/W\r
  58         V7YpzqlLmqwdwPturcT8rOun7NIyIrYJlri0pmmrPtl2T+5J/8RL8efy+r7fPFQg2K/RmhR8\r
  59         2rHw0vX1m/Sfv1lz8snKJ05KLMUZiYZazEXFiQAvinOvxAIAAA==\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Fri, 23 Mar 2012 03:34:14 -0000\r
  73 \r
  74 This makes more logical sense, since it makes the recursive printer\r
  75 responsible for the entire reply body and lets it start at the root of\r
  76 the MIME tree instead of the first child.  (We could move reply header\r
  77 creation in there, too, but if we ever support proper reply to\r
  78 multiple messages, we'll want just one set of reply headers computed\r
  79 from the entire message set and many bodies.)\r
  80 ---\r
  81  notmuch-reply.c |   12 ++++++------\r
  82  1 files changed, 6 insertions(+), 6 deletions(-)\r
  83 \r
  84 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  85 index 84a1220..0949d9f 100644\r
  86 --- a/notmuch-reply.c\r
  87 +++ b/notmuch-reply.c\r
  88 @@ -47,7 +47,11 @@ format_part_reply (mime_node_t *node)\r
  89  {\r
  90      int i;\r
  91  \r
  92 -    if (GMIME_IS_MESSAGE (node->part)) {\r
  93 +    if (node->envelope_file) {\r
  94 +       printf ("On %s, %s wrote:\n",\r
  95 +               notmuch_message_get_header (node->envelope_file, "date"),\r
  96 +               notmuch_message_get_header (node->envelope_file, "from"));\r
  97 +    } else if (GMIME_IS_MESSAGE (node->part)) {\r
  98         GMimeMessage *message = GMIME_MESSAGE (node->part);\r
  99         InternetAddressList *recipients;\r
 100         const char *recipients_string;\r
 101 @@ -540,13 +544,9 @@ notmuch_reply_format_default(void *ctx,\r
 102         g_object_unref (G_OBJECT (reply));\r
 103         reply = NULL;\r
 104  \r
 105 -       printf ("On %s, %s wrote:\n",\r
 106 -               notmuch_message_get_header (message, "date"),\r
 107 -               notmuch_message_get_header (message, "from"));\r
 108 -\r
 109         if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt,\r
 110                             &root) == NOTMUCH_STATUS_SUCCESS) {\r
 111 -           format_part_reply (mime_node_child (root, 0));\r
 112 +           format_part_reply (root);\r
 113             talloc_free (root);\r
 114         }\r
 115  \r
 116 -- \r
 117 1.7.7.3\r
 118 \r