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 4346D431FC0
\r
6 for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:41 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 SuFH6KCss4cb for <notmuch@notmuchmail.org>;
\r
16 Sun, 19 Feb 2012 16:26:39 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 80F05431FC4
\r
20 for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)
\r
21 X-AuditID: 12074424-b7fae6d000000906-e3-4f41933b973a
\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 93.22.02310.B33914F4; Sun, 19 Feb 2012 19:26:36 -0500 (EST)
\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 q1K0QZk9016451;
\r
27 Sun, 19 Feb 2012 19:26:35 -0500
\r
28 Received: from drake.mit.edu
\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 q1K0QYti000303
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Sun, 19 Feb 2012 19:26:35 -0500 (EST)
\r
35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)
\r
36 (envelope-from <amthrax@drake.mit.edu>)
\r
37 id 1RzH5N-0001yR-U1; Sun, 19 Feb 2012 19:26:33 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH v2 6/8] show: Make JSON helper functions print complete
\r
42 Date: Sun, 19 Feb 2012 19:26:28 -0500
\r
43 Message-Id: <1329697590-7404-7-git-send-email-amdragon@mit.edu>
\r
44 X-Mailer: git-send-email 1.7.7.3
\r
45 In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu>
\r
46 References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>
\r
47 <1329697590-7404-1-git-send-email-amdragon@mit.edu>
\r
48 X-Brightmail-Tracker:
\r
49 H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGsz2dHfYP1MFovrN2cyW7xZOY/V
\r
50 gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4uecBc8E0kYplOw+zNjDOFOhi5OSQEDCR
\r
51 uLJ5MROELSZx4d56ti5GLg4hgX2MEo3vr7CCJIQENjBKvPhpCJG4zySx+tB0dghnPqPEp4eH
\r
52 mUGq2AQ0JLbtX84IYosISEvsvDsbrJtZwEri8NVNYLawgL/E0UW3wWwWAVWJSxeOsIHYvAL2
\r
53 Eu/Wv2SDOENB4tzqc0ALODg4BRwkVu9whTiiVOLIky1MExj5FzAyrGKUTcmt0s1NzMwpTk3W
\r
54 LU5OzMtLLdI118vNLNFLTSndxAgKJHYXlR2MzYeUDjEKcDAq8fBKljn4C7EmlhVX5h5ilORg
\r
55 UhLlXTfJ0V+ILyk/pTIjsTgjvqg0J7X4EKMEB7OSCO8Ce6Acb0piZVVqUT5MSpqDRUmcV0Pr
\r
56 nZ+QQHpiSWp2ampBahFMVoaDQ0mCdxfIUMGi1PTUirTMnBKENBMHJ8hwHqDhs0FqeIsLEnOL
\r
57 M9Mh8qcYFaXEeetBEgIgiYzSPLheWKS/YhQHekWYdwVIFQ8wScB1vwIazAQ0mFfIDmRwSSJC
\r
58 SqqBcYLd552RUQlbNZ+dNzlZXPNzg+sZ53cJ7bUbjpVVS1z4vFOu6bY2cyB35Z/PF9mdPga8
\r
59 3Hjqluoph1ssHeHx6mf6v0w0jHrOWjrzdMrO78J+jj8k7mVzXE9WexirLV5y+fe7unm5Oqxx
\r
60 209vnL4uw2COBI8Xx7rPC1q3OtTvfhGcMuPkR2dJLiWW4oxEQy3mouJEAAeZNQ3PAgAA
\r
61 Cc: tomi.ollila@iki.fi
\r
62 X-BeenThere: notmuch@notmuchmail.org
\r
63 X-Mailman-Version: 2.1.13
\r
65 List-Id: "Use and development of the notmuch mail system."
\r
66 <notmuch.notmuchmail.org>
\r
67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
70 List-Post: <mailto:notmuch@notmuchmail.org>
\r
71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
74 X-List-Received-Date: Mon, 20 Feb 2012 00:26:41 -0000
\r
76 This makes the main recursive function easier to follow because helper
\r
77 functions don't add fields to the running object.
\r
79 notmuch-show.c | 15 +++++++--------
\r
80 1 files changed, 7 insertions(+), 8 deletions(-)
\r
82 diff --git a/notmuch-show.c b/notmuch-show.c
\r
83 index 6259d30..8fb6fa6 100644
\r
84 --- a/notmuch-show.c
\r
85 +++ b/notmuch-show.c
\r
86 @@ -297,7 +297,7 @@ format_headers_json (const void *ctx, GMimeMessage *message)
\r
87 InternetAddressList *recipients;
\r
88 const char *recipients_string;
\r
91 + printf ("{%s: %s",
\r
92 json_quote_str (local, "Subject"),
\r
93 json_quote_str (local, g_mime_message_get_subject (message)));
\r
95 @@ -315,7 +315,7 @@ format_headers_json (const void *ctx, GMimeMessage *message)
\r
97 json_quote_str (local, "Cc"),
\r
98 json_quote_str (local, recipients_string));
\r
99 - printf (", %s: %s",
\r
100 + printf (", %s: %s}",
\r
101 json_quote_str (local, "Date"),
\r
102 json_quote_str (local, g_mime_message_get_date_as_string (message)));
\r
104 @@ -406,7 +406,7 @@ signer_status_to_string (GMimeSignerStatus x)
\r
106 format_part_sigstatus_json (GMimeSignatureList *siglist)
\r
108 - printf (", \"sigstatus\": [");
\r
113 @@ -472,7 +472,7 @@ format_part_sigstatus_json (GMimeSignatureList *siglist)
\r
115 format_part_sigstatus_json (const GMimeSignatureValidity* validity)
\r
117 - printf (", \"sigstatus\": [");
\r
122 @@ -658,9 +658,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
124 format_message_json (ctx, node->envelope_file);
\r
126 - printf ("\"headers\": {");
\r
127 + printf ("\"headers\": ");
\r
128 format_headers_json (ctx, GMIME_MESSAGE (node->part));
\r
131 printf (", \"body\": [");
\r
132 format_part_json (ctx, mime_node_child (node, 0), first);
\r
133 @@ -696,6 +695,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
136 if (node->verify_attempted) {
\r
137 + printf (", \"sigstatus\": ");
\r
138 #ifdef GMIME_ATLEAST_26
\r
139 format_part_sigstatus_json (node->sig_list);
\r
141 @@ -746,9 +746,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
142 g_object_unref (stream_memory);
\r
144 if (GMIME_IS_MESSAGE (node->part)) {
\r
145 - printf ("\"headers\": {");
\r
146 + printf ("\"headers\": ");
\r
147 format_headers_json (local, GMIME_MESSAGE (node->part));
\r
150 printf (", \"body\": [");
\r