From: Austin Clements <amdragon@MIT.EDU>
Date: Tue, 7 Aug 2012 12:57:10 +0000 (-0400)
Subject: reply: Convert JSON format to use sprinter
X-Git-Tag: 0.14~8
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=e0d97a639c3f8cafd84c0c81b9412cfd48b516c1;hp=d41946ea781caaf9652d037caa5f65a93a199b80

reply: Convert JSON format to use sprinter

Almost all of reply was already being formatted using the sprinter.
This patch converts the top-level dictionary to use the sprinter
interface.
---

diff --git a/notmuch-reply.c b/notmuch-reply.c
index fa6665f7..e60a264b 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -614,20 +614,20 @@ notmuch_reply_format_json(void *ctx,
 	return 1;
 
     sp = sprinter_json_create (ctx, stdout);
+    sp->begin_map (sp);
 
     /* The headers of the reply message we've created */
-    printf ("{\"reply-headers\": ");
+    sp->map_key (sp, "reply-headers");
     format_headers_json (sp, reply, TRUE);
     g_object_unref (G_OBJECT (reply));
     reply = NULL;
 
     /* Start the original */
-    printf (", \"original\": ");
-
+    sp->map_key (sp, "original");
     format_part_json (ctx, sp, node, TRUE, TRUE);
 
     /* End */
-    printf ("}\n");
+    sp->end (sp);
     notmuch_message_destroy (message);
 
     return 0;