1 Return-Path: <jani@nikula.org>
\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 CE0A1431FAF
\r
6 for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:40:15 -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 tju43eBMD4OD for <notmuch@notmuchmail.org>;
\r
16 Thu, 17 May 2012 00:40:15 -0700 (PDT)
\r
17 Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com
\r
18 [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id BD930431FAE
\r
21 for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:40:14 -0700 (PDT)
\r
22 Received: by lagu2 with SMTP id u2so1267840lag.26
\r
23 for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:40:13 -0700 (PDT)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=from:to:subject:in-reply-to:references:user-agent:date:message-id
\r
27 :mime-version:content-type:x-gm-message-state;
\r
28 bh=CDm68BDzzhfko6/HI/HInJ2q3+90we5sC+F4IyccBAI=;
\r
29 b=Jf9kMhTFMThaY9+OSTjgBsGqe64jV+i5rXNfke/N9Tawex7FmRqoyoi7c6QlPRTGwR
\r
30 tLJJJF5OSnFw/g8ydms80k1MlVWxNRUdRwFJgKd336aMfJDxoSi8CrW0m010LOsC1Xpl
\r
31 HiWz777U0fmYrC3fC97vms0eNfxSdF1TTrZj163jXUOjS+keKQN4JxgGhNxav++/jYPK
\r
32 xW8KkB3gPDOElZrvguxGjVUgd9gQZ6JvDmjh8n7XZQCNGc4aDeJdULjkaoKhU2IuBLCE
\r
33 pLBqfXZ5+B5C4tVoYvRzZXPTFVFPcH/QuRM2g68j25VjBliL2LOtGkVE8D/MVA4wQ0u0
\r
35 Received: by 10.152.132.166 with SMTP id ov6mr6383606lab.35.1337240413100;
\r
36 Thu, 17 May 2012 00:40:13 -0700 (PDT)
\r
37 Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi.
\r
39 by mx.google.com with ESMTPS id oi3sm6696204lab.12.2012.05.17.00.40.11
\r
40 (version=SSLv3 cipher=OTHER); Thu, 17 May 2012 00:40:12 -0700 (PDT)
\r
41 From: Jani Nikula <jani@nikula.org>
\r
42 To: Jameson Graef Rollins <jrollins@finestructure.net>,
\r
43 Notmuch Mail <notmuch@notmuchmail.org>
\r
44 Subject: Re: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as
\r
46 In-Reply-To: <1337205359-2444-4-git-send-email-jrollins@finestructure.net>
\r
47 References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net>
\r
48 <1337205359-2444-2-git-send-email-jrollins@finestructure.net>
\r
49 <1337205359-2444-3-git-send-email-jrollins@finestructure.net>
\r
50 <1337205359-2444-4-git-send-email-jrollins@finestructure.net>
\r
51 User-Agent: Notmuch/0.13+13~gc259b9a (http://notmuchmail.org) Emacs/23.3.1
\r
53 Date: Thu, 17 May 2012 10:40:09 +0300
\r
54 Message-ID: <878vgri7c6.fsf@nikula.org>
\r
56 Content-Type: text/plain; charset=us-ascii
\r
58 ALoCoQnkaoP7y4X1hI4DftRPfu1xuC1OYioyqLZWdk/FlWcSg2r1UtqG63UDsYZtyfSmOY+hmxFr
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Thu, 17 May 2012 07:40:15 -0000
\r
73 On Thu, 17 May 2012, Jameson Graef Rollins <jrollins@finestructure.net> wrote:
\r
74 > Again, for interface simplification and getting rid of more #ifdefs.
\r
76 > mime-node.c | 10 ++--------
\r
77 > notmuch-client.h | 14 +++++---------
\r
78 > notmuch-reply.c | 6 ++----
\r
79 > notmuch-show.c | 3 +--
\r
80 > 4 files changed, 10 insertions(+), 23 deletions(-)
\r
82 > diff --git a/mime-node.c b/mime-node.c
\r
83 > index 79a3654..4faeffc 100644
\r
86 > @@ -56,12 +56,7 @@ _mime_node_context_free (mime_node_context_t *res)
\r
89 > mime_node_open (const void *ctx, notmuch_message_t *message,
\r
90 > -#ifdef GMIME_ATLEAST_26
\r
91 > - GMimeCryptoContext *cryptoctx,
\r
93 > - GMimeCipherContext *cryptoctx,
\r
95 > - notmuch_bool_t decrypt, mime_node_t **root_out)
\r
96 > + notmuch_crypto_t *crypto, mime_node_t **root_out)
\r
98 > const char *filename = notmuch_message_get_filename (message);
\r
99 > mime_node_context_t *mctx;
\r
100 > @@ -113,8 +108,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
\r
104 > - mctx->crypto.gpgctx = cryptoctx;
\r
105 > - mctx->crypto.decrypt = decrypt;
\r
106 > + mctx->crypto = *crypto;
\r
108 > /* Create the root node */
\r
109 > root->part = GMIME_OBJECT (mctx->mime_message);
\r
110 > diff --git a/notmuch-client.h b/notmuch-client.h
\r
111 > index 2ad24cf..d86fab3 100644
\r
112 > --- a/notmuch-client.h
\r
113 > +++ b/notmuch-client.h
\r
114 > @@ -345,9 +345,10 @@ struct mime_node {
\r
117 > /* Construct a new MIME node pointing to the root message part of
\r
118 > - * message. If cryptoctx is non-NULL, it will be used to verify
\r
119 > - * signatures on any child parts. If decrypt is true, then cryptoctx
\r
120 > - * will additionally be used to decrypt any encrypted child parts.
\r
121 > + * message. If crypto.gpgctx is non-NULL, it will be used to verify
\r
122 > + * signatures on any child parts. If crypto.decrypt is true, then
\r
123 > + * crypto.gpgctx will additionally be used to decrypt any encrypted
\r
128 > @@ -359,12 +360,7 @@ struct mime_node {
\r
131 > mime_node_open (const void *ctx, notmuch_message_t *message,
\r
132 > -#ifdef GMIME_ATLEAST_26
\r
133 > - GMimeCryptoContext *cryptoctx,
\r
135 > - GMimeCipherContext *cryptoctx,
\r
137 > - notmuch_bool_t decrypt, mime_node_t **node_out);
\r
138 > + notmuch_crypto_t *crypto, mime_node_t **node_out);
\r
140 > /* Return a new MIME node for the requested child part of parent.
\r
141 > * parent will be used as the talloc context for the returned child
\r
142 > diff --git a/notmuch-reply.c b/notmuch-reply.c
\r
143 > index ed87899..6662adb 100644
\r
144 > --- a/notmuch-reply.c
\r
145 > +++ b/notmuch-reply.c
\r
146 > @@ -544,8 +544,7 @@ notmuch_reply_format_default(void *ctx,
\r
147 > g_object_unref (G_OBJECT (reply));
\r
150 > - if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt,
\r
151 > - &root) == NOTMUCH_STATUS_SUCCESS) {
\r
152 > + if (mime_node_open (ctx, message, crypto, &root) == NOTMUCH_STATUS_SUCCESS) {
\r
153 > format_part_reply (root);
\r
154 > talloc_free (root);
\r
156 > @@ -574,8 +573,7 @@ notmuch_reply_format_json(void *ctx,
\r
158 > messages = notmuch_query_search_messages (query);
\r
159 > message = notmuch_messages_get (messages);
\r
160 > - if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt,
\r
161 > - &node) != NOTMUCH_STATUS_SUCCESS)
\r
162 > + if (mime_node_open (ctx, message, crypto, &node) != NOTMUCH_STATUS_SUCCESS)
\r
165 > reply = create_reply_message (ctx, config, message, reply_all);
\r
166 > diff --git a/notmuch-show.c b/notmuch-show.c
\r
167 > index d254179..8b4d308 100644
\r
168 > --- a/notmuch-show.c
\r
169 > +++ b/notmuch-show.c
\r
170 > @@ -810,8 +810,7 @@ show_message (void *ctx,
\r
171 > mime_node_t *root, *part;
\r
172 > notmuch_status_t status;
\r
174 > - status = mime_node_open (local, message, params->crypto.gpgctx,
\r
175 > - params->crypto.decrypt, &root);
\r
176 > + status = mime_node_open (local, message, &(params->crypto), &root);
\r
178 The parenthesis around params->crypto are not needed, otherwise LGTM.
\r
182 > part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
\r
186 > _______________________________________________
\r
187 > notmuch mailing list
\r
188 > notmuch@notmuchmail.org
\r
189 > http://notmuchmail.org/mailman/listinfo/notmuch
\r