84/03e841240a0295b5e933ca793864616b4391cc

   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 390A7431FAE\r
   6         for <notmuch@notmuchmail.org>; Tue, 27 Mar 2012 14:59:58 -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 SlBY-El2B29S for <notmuch@notmuchmail.org>;\r
  16         Tue, 27 Mar 2012 14:59:57 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
  18         [18.7.68.37])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 98E8C431FAF\r
  20         for <notmuch@notmuchmail.org>; Tue, 27 Mar 2012 14:59:57 -0700 (PDT)\r
  21 X-AuditID: 12074425-b7f4a6d0000008e0-13-4f72385cfad5\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 52.CC.02272.C58327F4; Tue, 27 Mar 2012 17:59:56 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q2RLxuU2012883; \r
  27         Tue, 27 Mar 2012 17:59:56 -0400\r
  28 Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2RLxtkK014144\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Tue, 27 Mar 2012 17:59:55 -0400 (EDT)\r
  34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amthrax@drake.mit.edu>)\r
  36         id 1SCeQk-0008Vv-SD; Tue, 27 Mar 2012 17:59:54 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v2 3/3] reply: Move reply citation printing to the recursive\r
  40         MIME walk\r
  41 Date: Tue, 27 Mar 2012 17:59:52 -0400\r
  42 Message-Id: <1332885592-32668-4-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.9.1\r
  44 In-Reply-To: <1332885592-32668-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
  46         <1332885592-32668-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrBtjUeRvsOyouMX1mzOZHRg9nq26\r
  49         xRzAGMVlk5Kak1mWWqRvl8CVseKpRcF5nor3M36wNzDO5epi5OSQEDCR6Ni7iQnCFpO4cG89\r
  50         WxcjF4eQwD5GiVsTH7GAJIQENjBK3PvrB5E4ziSxcdE0RghnPqPEs8bDYFVsAhoS2/YvZwSx\r
  51         RQSkJXbenc3axcjBwSygJvGnSwUkLCwQJrGlexMziM0ioCrxYt0idhCbV8BB4uGxm6wQVyhI\r
  52         PFt3HOwiTgFHiau73jBBHFEmcefSadYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Vro\r
  53         5WaW6KWmlG5iBIUMu4vqDsYJh5QOMQpwMCrx8FYxFfkLsSaWFVfmHmKU5GBSEuVVMAUK8SXl\r
  54         p1RmJBZnxBeV5qQWH2KU4GBWEuHVjir0F+JNSaysSi3Kh0lJc7AoifNqar3zExJITyxJzU5N\r
  55         LUgtgsnKcHAoSfC2mQMNFSxKTU+tSMvMKUFIM3FwggznARr+2Qyohre4IDG3ODMdIn+KUVFK\r
  56         nHcOSLMASCKjNA+uFxbTrxjFgV4R5s0DqeIBpgO47ldAg5mABi85kg8yuCQRISXVwLj935Sz\r
  57         BzV/pRm8WnzthWV8wI3fUkdnx3iI/t/V/LTiJdfujMkG2kosRx9d1G5SWbtfRWc6a8mWa2oX\r
  58         m96secUbdD9Vn41hnuUNxqCwoCbdaLHqwxuSbdSWTVG+IKGx99RZz/0sOjH/8g4tfTdH9VF/\r
  59         lcI5Kb4vW0TUNNT3awgwfY9YebVcQlaJpTgj0VCLuag4EQAejNGCxAIAAA==\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: Tue, 27 Mar 2012 21:59:58 -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.9.1\r
 118 \r