70/08fca0bcf8d8804eb0c14241fbe537b5f4f2f0

   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 11BA5431FC4\r
   6         for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 05:57:18 -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 hJMiea4Twxw8 for <notmuch@notmuchmail.org>;\r
  16         Tue,  7 Aug 2012 05:57:15 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id B2F09431FAF\r
  20         for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 05:57:15 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7fa06d0000008c2-d8-502110ab6a40\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id A1.BD.02242.BA011205; Tue,  7 Aug 2012 08:57:15 -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 q77CvE32024991; \r
  27         Tue, 7 Aug 2012 08:57:14 -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 q77CvDrq004545\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Tue, 7 Aug 2012 08:57:14 -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 1SyjLU-0002cg-Qf; Tue, 07 Aug 2012 08:57:12 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH] reply: Convert JSON format to use sprinter\r
  41 Date: Tue,  7 Aug 2012 08:57:10 -0400\r
  42 Message-Id: <1344344230-9937-1-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10\r
  44 X-Brightmail-Tracker:\r
  45  H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsUixCmqrLtaQDHA4P1fcYvrN2cyOzB6PFt1\r
  46         izmAMYrLJiU1J7MstUjfLoEr4+bKLqaCRxwVPbsvsDUwXmHrYuTgkBAwkWi4kdbFyAlkiklc\r
  47         uLceKMzFISSwj1Hi4o5DzBDOekaJ6U/2QGUeMklsW3qCBaRFSGAuo8SMzYkgNpuAhsS2/csZ\r
  48         QWwRAWmJnXdns4JsYBZQk/jTpQISFhawlvhz6hATiM0ioCrx8fdxMJtXwF6i+d0XVogr5CWe\r
  49         3u9jm8DIu4CRYRWjbEpulW5uYmZOcWqybnFyYl5eapGuuV5uZoleakrpJkZQCLC7qOxgbD6k\r
  50         dIhRgINRiYf3ApdCgBBrYllxZe4hRkkOJiVRXmE+xQAhvqT8lMqMxOKM+KLSnNTiQ4wSHMxK\r
  51         IryHdwKV86YkVlalFuXDpKQ5WJTEea+n3PQXEkhPLEnNTk0tSC2CycpwcChJ8P7kBxoqWJSa\r
  52         nlqRlplTgpBm4uAEGc4DNPwISA1vcUFibnFmOkT+FKOilDjve5CEAEgiozQPrhcWo68YxYFe\r
  53         Eea9D1LFA4xvuO5XQIOZgAZ7y8uBDC5JREhJNTCumTDnTLAsm+38pO5znp/+pUvx/zNYnHI/\r
  54         WTwrSMXk2Tltu9Z4ffbXb34a89x+YFPL5HJOd0PDpnOW19p/6uRvqGubcGBNuhmfXzNHbezu\r
  55         Sg82seafVoYHVsa/O7x5/UpeyRMzzPn3TzlhvWnBs7up6Xw7HgjM5a61UFsvUMD098dyJx9F\r
  56         1zQlluKMREMt5qLiRACINDE7rAIAAA==\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Tue, 07 Aug 2012 12:57:18 -0000\r
  70 \r
  71 Almost all of reply was already being formatted using the sprinter.\r
  72 This patch converts the top-level dictionary to use the sprinter\r
  73 interface.\r
  74 ---\r
  75 \r
  76 One last sprinter piece that had slipped through the cracks.\r
  77 \r
  78  notmuch-reply.c |    8 ++++----\r
  79  1 file changed, 4 insertions(+), 4 deletions(-)\r
  80 \r
  81 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  82 index fa6665f..e60a264 100644\r
  83 --- a/notmuch-reply.c\r
  84 +++ b/notmuch-reply.c\r
  85 @@ -614,20 +614,20 @@ notmuch_reply_format_json(void *ctx,\r
  86         return 1;\r
  87  \r
  88      sp = sprinter_json_create (ctx, stdout);\r
  89 +    sp->begin_map (sp);\r
  90  \r
  91      /* The headers of the reply message we've created */\r
  92 -    printf ("{\"reply-headers\": ");\r
  93 +    sp->map_key (sp, "reply-headers");\r
  94      format_headers_json (sp, reply, TRUE);\r
  95      g_object_unref (G_OBJECT (reply));\r
  96      reply = NULL;\r
  97  \r
  98      /* Start the original */\r
  99 -    printf (", \"original\": ");\r
 100 -\r
 101 +    sp->map_key (sp, "original");\r
 102      format_part_json (ctx, sp, node, TRUE, TRUE);\r
 103  \r
 104      /* End */\r
 105 -    printf ("}\n");\r
 106 +    sp->end (sp);\r
 107      notmuch_message_destroy (message);\r
 108  \r
 109      return 0;\r
 110 -- \r
 111 1.7.10\r
 112 \r