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 5BC8C431FD6
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 Apr 2012 17:58:05 -0700 (PDT)
\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 sNt0QtO5g-YM for <notmuch@notmuchmail.org>;
\r
16 Sat, 7 Apr 2012 17:58:01 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 5CB9F431FCF
\r
20 for <notmuch@notmuchmail.org>; Sat, 7 Apr 2012 17:58:00 -0700 (PDT)
\r
21 X-AuditID: 1209190d-b7fbf6d0000008ba-21-4f80e298fbbd
\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 E7.6E.02234.892E08F4; Sat, 7 Apr 2012 20:58:00 -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 q380vx8t027086;
\r
27 Sat, 7 Apr 2012 20:57:59 -0400
\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 q380vwJs002166
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Sat, 7 Apr 2012 20:57:59 -0400 (EDT)
\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 1SGgS6-0001SS-5K; Sat, 07 Apr 2012 20:57:58 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: =?UTF-8?q?=5BPATCH=203/6=5D=20Remove=20show-message=2Ec?=
\r
41 Date: Sat, 7 Apr 2012 20:57:47 -0400
\r
42 Message-Id: <1333846670-5356-4-git-send-email-amdragon@mit.edu>
\r
43 X-Mailer: git-send-email 1.7.9.1
\r
44 In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu>
\r
45 References: <1333846670-5356-1-git-send-email-amdragon@mit.edu>
\r
47 Content-Type: text/plain; charset=UTF-8
\r
48 Content-Transfer-Encoding: 8bit
\r
49 X-Brightmail-Tracker:
\r
50 H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hRV1p3xqMHfYMV8XovrN2cyOzB6PFt1
\r
51 izmAMYrLJiU1J7MstUjfLoEr4/q02YwFD5Uq9j3Zx9TAeFe6i5GTQ0LARGL5j9uMELaYxIV7
\r
52 69m6GLk4hAT2MUpsufmYFcJZzyjRP38lO0iVkMA9Jolpt4shEvMZJfoazoC1swloSGzbvxzM
\r
53 FhGQlth5dzZQNwcHs4CaxJ8uFRBTWMBJ4sI/QZAKFgFVibb/a8GqeQXsJe59aGKFOEJB4tm6
\r
54 40wgNqeAg8T21q3MEGvtJZYuPg5VLyhxcuYTFojp6hLr5wmBhJkF5CWat85mnsAoNAtJ1SyE
\r
55 qllIqhYwMq9ilE3JrdLNTczMKU5N1i1OTszLSy3SNdLLzSzRS00p3cQIDl9J3h2M7w4qHWIU
\r
56 4GBU4uF9uKPBX4g1say4MvcQoyQHk5Io79MHQCG+pPyUyozE4oz4otKc1OJDjBIczEoivPcP
\r
57 A+V4UxIrq1KL8mFS0hwsSuK8qlrv/IQE0hNLUrNTUwtSi2CyMhwcShK8rx8CNQoWpaanVqRl
\r
58 5pQgpJk4OEGG8wANvwdSw1tckJhbnJkOkT/FqMtx93zvFUYhlrz8vFQpcd59IEUCIEUZpXlw
\r
59 c2Bp5xWjONBbwrzfQap4gCkLbtIroCVMQEtqXtWDLClJREhJNTBm2t5Rv7rjI//a39a6Lw+1
\r
60 Z7VM+aQ85d7tUKmw4vmzq7bVtUzaGP70N5t+xY457hWr1/ydUmq9ZjPrAvcl7/isFSbeavN3
\r
61 cJxgfEx0SfqXwqVfQpc1XJzpI/CTs/FMR00e25nF1WEPV+8L+f6lV6btXcjHdcFRUmsuP75j
\r
62 Jt8rvIJRin0F27E5SizFGYmGWsxFxYkAx1ZUeRYDAAA=
\r
63 X-BeenThere: notmuch@notmuchmail.org
\r
64 X-Mailman-Version: 2.1.13
\r
66 List-Id: "Use and development of the notmuch mail system."
\r
67 <notmuch.notmuchmail.org>
\r
68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
71 List-Post: <mailto:notmuch@notmuchmail.org>
\r
72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
74 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
75 X-List-Received-Date: Sun, 08 Apr 2012 00:58:06 -0000
\r
77 There are no more calls to show_message_body.
\r
79 Makefile.local | 1 -
\r
80 notmuch-client.h | 5 ---
\r
81 show-message.c | 106 ------------------------------------------------------
\r
82 3 files changed, 0 insertions(+), 112 deletions(-)
\r
83 delete mode 100644 show-message.c
\r
85 diff --git a/Makefile.local b/Makefile.local
\r
86 index 1131dea..935f0f1 100644
\r
87 --- a/Makefile.local
\r
88 +++ b/Makefile.local
\r
89 @@ -301,7 +301,6 @@ notmuch_client_srcs = \
\r
97 diff --git a/notmuch-client.h b/notmuch-client.h
\r
98 index 203ac49..34155fc 100644
\r
99 --- a/notmuch-client.h
\r
100 +++ b/notmuch-client.h
\r
101 @@ -184,11 +184,6 @@ char *
\r
102 query_string_from_args (void *ctx, int argc, char *argv[]);
\r
105 -show_message_body (notmuch_message_t *message,
\r
106 - const notmuch_show_format_t *format,
\r
107 - notmuch_show_params_t *params);
\r
110 show_one_part (const char *filename, int part);
\r
113 diff --git a/show-message.c b/show-message.c
\r
114 deleted file mode 100644
\r
115 index 83ecf81..0000000
\r
116 --- a/show-message.c
\r
119 -/* notmuch - Not much of an email program, (just index and search)
\r
121 - * Copyright © 2009 Carl Worth
\r
122 - * Copyright © 2009 Keith Packard
\r
124 - * This program is free software: you can redistribute it and/or modify
\r
125 - * it under the terms of the GNU General Public License as published by
\r
126 - * the Free Software Foundation, either version 3 of the License, or
\r
127 - * (at your option) any later version.
\r
129 - * This program is distributed in the hope that it will be useful,
\r
130 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
131 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
132 - * GNU General Public License for more details.
\r
134 - * You should have received a copy of the GNU General Public License
\r
135 - * along with this program. If not, see http://www.gnu.org/licenses/ .
\r
137 - * Authors: Carl Worth <cworth@cworth.org>
\r
138 - * Keith Packard <keithp@keithp.com>
\r
141 -#include "notmuch-client.h"
\r
143 -typedef struct show_message_state {
\r
145 -} show_message_state_t;
\r
148 -show_message_part (mime_node_t *node,
\r
149 - show_message_state_t *state,
\r
150 - const notmuch_show_format_t *format,
\r
153 - /* Formatters expect the envelope for embedded message parts */
\r
154 - GMimeObject *part = node->envelope_part ?
\r
155 - GMIME_OBJECT (node->envelope_part) : node->part;
\r
159 - fputs (format->part_sep, stdout);
\r
161 - /* Format this part */
\r
162 - if (format->part_start)
\r
163 - format->part_start (part, &(state->part_count));
\r
165 - if (node->decrypt_attempted && format->part_encstatus)
\r
166 - format->part_encstatus (node->decrypt_success);
\r
168 - if (node->verify_attempted && format->part_sigstatus)
\r
169 -#ifdef GMIME_ATLEAST_26
\r
170 - format->part_sigstatus (node->sig_list);
\r
172 - format->part_sigstatus (node->sig_validity);
\r
175 - format->part_content (part);
\r
177 - if (node->envelope_part) {
\r
178 - fputs (format->header_start, stdout);
\r
179 - if (format->header_message_part)
\r
180 - format->header_message_part (GMIME_MESSAGE (node->part));
\r
181 - fputs (format->header_end, stdout);
\r
183 - fputs (format->body_start, stdout);
\r
186 - /* Recurse over the children */
\r
187 - state->part_count += 1;
\r
188 - for (i = 0; i < node->nchildren; i++)
\r
189 - show_message_part (mime_node_child (node, i), state, format, i == 0);
\r
191 - /* Finish this part */
\r
192 - if (node->envelope_part)
\r
193 - fputs (format->body_end, stdout);
\r
195 - if (format->part_end)
\r
196 - format->part_end (part);
\r
200 -show_message_body (notmuch_message_t *message,
\r
201 - const notmuch_show_format_t *format,
\r
202 - notmuch_show_params_t *params)
\r
204 - notmuch_status_t ret;
\r
205 - show_message_state_t state;
\r
206 - mime_node_t *root, *part;
\r
208 - ret = mime_node_open (NULL, message, params->cryptoctx, params->decrypt,
\r
213 - /* The caller of show_message_body has already handled the
\r
214 - * outermost envelope, so skip it. */
\r
215 - state.part_count = MAX (params->part, 1);
\r
217 - part = mime_node_seek_dfs (root, state.part_count);
\r
219 - show_message_part (part, &state, format, TRUE);
\r
221 - talloc_free (root);
\r
223 - return NOTMUCH_STATUS_SUCCESS;
\r