36/7a6907da4b1f7408733ba39e227c8ad4262266

   1 Return-Path: <amdragon@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 E2401431FAE\r
   6         for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:17 -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 4Z-QBJevFiOm for <notmuch@notmuchmail.org>;\r
  16         Tue, 24 Jul 2012 19:35:15 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
  18         [18.7.68.35])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 9FE32431FDE\r
  20         for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:06 -0700 (PDT)\r
  21 X-AuditID: 12074423-b7f396d0000008f4-b6-500f5b59c105\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id C5.19.02292.95B5F005; Tue, 24 Jul 2012 22:35:05 -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 q6P2Z4XD011169; \r
  27         Tue, 24 Jul 2012 22:35:04 -0400\r
  28 Received: from drake.dyndns.org\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 q6P2Z287025122\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Tue, 24 Jul 2012 22:35:04 -0400 (EDT)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1StrRG-0004Zp-CW; Tue, 24 Jul 2012 22:35:02 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 05/13] reply: Create a JSON sprinter\r
  41 Date: Tue, 24 Jul 2012 22:34:45 -0400\r
  42 Message-Id: <1343183693-17134-6-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10\r
  44 In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrBsZzR9gcPUMu8XehnZGi+s3ZzI7\r
  48         MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBknbkxjLLjFXvHp7RHmBsYOti5GTg4JAROJ\r
  49         PQuWskDYYhIX7q0HinNxCAnsY5S4On8bI0hCSGADo8TxDi2IxCMmib0XfzJDOHMZJZ51XgIb\r
  50         xSagIbFt/3KwDhEBaYmdd2ezgtjMAmYSc39OBKrh4BAGWrdhZwFImEVAVeLdus+MIGFeAQeJ\r
  51         K0+gDpKXeHq/D8zmFHCUOL9kIdQNDhI9i6+xT2DkX8DIsIpRNiW3Sjc3MTOnODVZtzg5MS8v\r
  52         tUjXTC83s0QvNaV0EyMojNhdlHcw/jmodIhRgINRiYf31xO+ACHWxLLiytxDjJIcTEqivBXB\r
  53         /AFCfEn5KZUZicUZ8UWlOanFhxglOJiVRHiLwoByvCmJlVWpRfkwKWkOFiVx3mspN/2FBNIT\r
  54         S1KzU1MLUotgsjIcHEoSvK1RQI2CRanpqRVpmTklCGkmDk6Q4TxAw3eD1PAWFyTmFmemQ+RP\r
  55         MSpKifNeBUkIgCQySvPgemFx/opRHOgVYYh2HmCKgOt+BTSYCWjw8zA+kMEliQgpqQZGx7Jv\r
  56         DAGzL5kLJn2YUWA1u7J2eTSTZGaXd6z62d5n63UdH03fnZGQMLONR6o6rU3KqO5utNR74XfX\r
  57         zJJ++pVdO9jsudru/9vaNu+/zrNmpE1Wu/BFfeo7zVVLw+SVTZ3jYm20v7b0aOUbTvIMvD9b\r
  58         MMKar2yt0yp2Kc2YeZo8LVp9KzZ0fVNiKc5INNRiLipOBAAEp8RYzgIAAA==\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Wed, 25 Jul 2012 02:35:18 -0000\r
  72 \r
  73 ---\r
  74  notmuch-reply.c |    4 ++++\r
  75  1 file changed, 4 insertions(+)\r
  76 \r
  77 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  78 index de21f3b..e42ba79 100644\r
  79 --- a/notmuch-reply.c\r
  80 +++ b/notmuch-reply.c\r
  81 @@ -22,6 +22,7 @@\r
  82  \r
  83  #include "notmuch-client.h"\r
  84  #include "gmime-filter-headers.h"\r
  85 +#include "sprinter.h"\r
  86  \r
  87  static void\r
  88  show_reply_headers (GMimeMessage *message)\r
  89 @@ -596,6 +597,7 @@ notmuch_reply_format_json(void *ctx,\r
  90      notmuch_messages_t *messages;\r
  91      notmuch_message_t *message;\r
  92      mime_node_t *node;\r
  93 +    sprinter_t *sp;\r
  94  \r
  95      if (notmuch_query_count_messages (query) != 1) {\r
  96         fprintf (stderr, "Error: search term did not match precisely one message.\n");\r
  97 @@ -611,6 +613,8 @@ notmuch_reply_format_json(void *ctx,\r
  98      if (!reply)\r
  99         return 1;\r
 100  \r
 101 +    sp = sprinter_json_create (ctx, stdout);\r
 102 +\r
 103      /* The headers of the reply message we've created */\r
 104      printf ("{\"reply-headers\": ");\r
 105      format_headers_json (ctx, reply, TRUE);\r
 106 -- \r
 107 1.7.10\r
 108 \r