Re: [PATCH] reply: Convert JSON format to use sprinter

diff --git a/a1/422ae65f97dd92862b0b062a40a383dc09c0e7 b/a1/422ae65f97dd92862b0b062a40a383dc09c0e7
new file mode 100644 (file)
index 0000000..2f75314
--- /dev/null
+++ b/a1/422ae65f97dd92862b0b062a40a383dc09c0e7
@@ -0,0 +1,103 @@
+Return-Path: <tomi.ollila@iki.fi>\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 42606431FD5\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 06:06:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 xnYNP4va3FDX for <notmuch@notmuchmail.org>;\r
+       Tue,  7 Aug 2012 06:06:56 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6EB50431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 06:06:56 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 7ED9E1002A4; Tue,  7 Aug 2012 16:07:04 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] reply: Convert JSON format to use sprinter\r
+In-Reply-To: <1344344230-9937-1-git-send-email-amdragon@mit.edu>\r
+References: <1344344230-9937-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.13.2+128~g07453d8 (http://notmuchmail.org) Emacs/23.1.1\r
+       (x86_64-redhat-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 07 Aug 2012 16:07:04 +0300\r
+Message-ID: <m21ujisvev.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Tue, 07 Aug 2012 13:06:57 -0000\r
+\r
+On Tue, Aug 07 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> Almost all of reply was already being formatted using the sprinter.\r
+> This patch converts the top-level dictionary to use the sprinter\r
+> interface.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>\r
+> One last sprinter piece that had slipped through the cracks.\r
+>\r
+>  notmuch-reply.c |    8 ++++----\r
+>  1 file changed, 4 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+> index fa6665f..e60a264 100644\r
+> --- a/notmuch-reply.c\r
+> +++ b/notmuch-reply.c\r
+> @@ -614,20 +614,20 @@ notmuch_reply_format_json(void *ctx,\r
+>      return 1;\r
+>  \r
+>      sp = sprinter_json_create (ctx, stdout);\r
+> +    sp->begin_map (sp);\r
+>  \r
+>      /* The headers of the reply message we've created */\r
+> -    printf ("{\"reply-headers\": ");\r
+> +    sp->map_key (sp, "reply-headers");\r
+>      format_headers_json (sp, reply, TRUE);\r
+>      g_object_unref (G_OBJECT (reply));\r
+>      reply = NULL;\r
+>  \r
+>      /* Start the original */\r
+> -    printf (", \"original\": ");\r
+> -\r
+> +    sp->map_key (sp, "original");\r
+>      format_part_json (ctx, sp, node, TRUE, TRUE);\r
+>  \r
+>      /* End */\r
+> -    printf ("}\n");\r
+> +    sp->end (sp);\r
+>      notmuch_message_destroy (message);\r
+>  \r
+>      return 0;\r
+> -- \r
+> 1.7.10\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r