Re: [PATCH 0/4] Allow specifying alternate names for addresses in other_email
[notmuch-archives.git] / cd / 048a2e2f7119432e15e9c054c9fcb60d8729f1
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 E6BE7431FBD\r
6         for <notmuch@notmuchmail.org>; Wed,  7 Nov 2012 07:27:09 -0800 (PST)\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 vTgUB5SCzg-X for <notmuch@notmuchmail.org>;\r
16         Wed,  7 Nov 2012 07:27:09 -0800 (PST)\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
18         [18.9.25.13])\r
19         by olra.theworths.org (Postfix) with ESMTP id 3C37F431FBC\r
20         for <notmuch@notmuchmail.org>; Wed,  7 Nov 2012 07:27:09 -0800 (PST)\r
21 X-AuditID: 1209190d-b7f906d0000008de-bd-509a7dcc0475\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
24         id 07.6E.02270.CCD7A905; Wed,  7 Nov 2012 10:27:08 -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 qA7FR7J3027033; \r
27         Wed, 7 Nov 2012 10:27:07 -0500\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 qA7FR5MI027050\r
33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
34         Wed, 7 Nov 2012 10:27:06 -0500 (EST)\r
35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
36         (envelope-from <amdragon@mit.edu>)\r
37         id 1TW7Wy-0005lF-TC; Wed, 07 Nov 2012 10:27:04 -0500\r
38 From: Austin Clements <amdragon@MIT.EDU>\r
39 To: notmuch@notmuchmail.org\r
40 Subject: [PATCH 2/3] show: More aggressively document the presence of\r
41         devel/schemata\r
42 Date: Wed,  7 Nov 2012 10:27:01 -0500\r
43 Message-Id: <1352302022-21486-3-git-send-email-amdragon@mit.edu>\r
44 X-Mailer: git-send-email 1.7.10\r
45 In-Reply-To: <1352302022-21486-1-git-send-email-amdragon@mit.edu>\r
46 References: <1352302022-21486-1-git-send-email-amdragon@mit.edu>\r
47 X-Brightmail-Tracker:\r
48  H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixCmqrHumdlaAwe8tahbXb85ktnjeupfJ\r
49         gclj56y77B7PVt1iDmCK4rJJSc3JLEst0rdL4Mq4saCbreA5d8W/OU1sDYzLOLsYOTkkBEwk\r
50         Li88zghhi0lcuLeerYuRi0NIYB+jxMu3XSwQznpGif27JkE5D5kkpu1rYYZw5jJKfJg9lQmk\r
51         n01AQ2Lb/uVgs0QEpCV23p3NCmIzC1hJLHt8ASwuLBAi8WjDPDYQm0VAVWL9oltgcV4BB4kd\r
52         cyczQ9whL/H0fh9YDaeAo8SmB7/B5ggB1RzY9pZpAiP/AkaGVYyyKblVurmJmTnFqcm6xcmJ\r
53         eXmpRbpGermZJXqpKaWbGMHBJMm7g/HdQaVDjAIcjEo8vA2RMwOEWBPLiitzDzFKcjApifIe\r
54         q54VIMSXlJ9SmZFYnBFfVJqTWnyIUYKDWUmEl6UQKMebklhZlVqUD5OS5mBREue9knLTX0gg\r
55         PbEkNTs1tSC1CCYrw8GhJMH7twaoUbAoNT21Ii0zpwQhzcTBCTKcB2j4VZAa3uKCxNzizHSI\r
56         /ClGRSlx3uUgCQGQREZpHlwvLNpfMYoDvSLMewikigeYKOC6XwENZgIaXHxtBsjgkkSElFQD\r
57         Y36Iab9Hq8QurcmKBj3sv3n3xvyIvrOkfM2Xpz71LIb81jqLLtcV/C/0zC46f3p/buTqV/ef\r
58         /BH4Nn++u6h36fvarNjXLH/Kgwy7uxcKfIxfVXjLXj2NrZp9SYPdzA0apVFzXMM+am5bnGaw\r
59         8MAtQ3uxU9/7VFXWasQIPKx9En7RLEh/2/5kJZbijERDLeai4kQA6iLfUdECAAA=\r
60 X-BeenThere: notmuch@notmuchmail.org\r
61 X-Mailman-Version: 2.1.13\r
62 Precedence: list\r
63 List-Id: "Use and development of the notmuch mail system."\r
64         <notmuch.notmuchmail.org>\r
65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
68 List-Post: <mailto:notmuch@notmuchmail.org>\r
69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
72 X-List-Received-Date: Wed, 07 Nov 2012 15:27:10 -0000\r
73 \r
74 Previously, the only mention of devel/schemata was a comment at the\r
75 top of format_part_json, but the JSON output code is spread across\r
76 several functions that are distributed across notmuch-show.c.  Add\r
77 references from the other three key JSON output functions.\r
78 ---\r
79  notmuch-show.c |    9 +++++++++\r
80  1 file changed, 9 insertions(+)\r
81 \r
82 diff --git a/notmuch-show.c b/notmuch-show.c\r
83 index f758f56..2fa2292 100644\r
84 --- a/notmuch-show.c\r
85 +++ b/notmuch-show.c\r
86 @@ -110,6 +110,9 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message)\r
87  static void\r
88  format_message_json (sprinter_t *sp, notmuch_message_t *message)\r
89  {\r
90 +    /* Any changes to the JSON format should be reflected in the file\r
91 +     * devel/schemata. */\r
92 +\r
93      void *local = talloc_new (NULL);\r
94      notmuch_tags_t *tags;\r
95      time_t date;\r
96 @@ -208,6 +211,9 @@ void\r
97  format_headers_json (sprinter_t *sp, GMimeMessage *message,\r
98                      notmuch_bool_t reply)\r
99  {\r
100 +    /* Any changes to the JSON format should be reflected in the file\r
101 +     * devel/schemata. */\r
102 +\r
103      InternetAddressList *recipients;\r
104      const char *recipients_string;\r
105      const char *reply_to_string;\r
106 @@ -359,6 +365,9 @@ signer_status_to_string (GMimeSignerStatus x)\r
107  static void\r
108  format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node)\r
109  {\r
110 +    /* Any changes to the JSON format should be reflected in the file\r
111 +     * devel/schemata. */\r
112 +\r
113      GMimeSignatureList *siglist = node->sig_list;\r
114  \r
115      sp->begin_list (sp);\r
116 -- \r
117 1.7.10\r
118 \r