1 Return-Path: <tomi.ollila@iki.fi>
\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 arlo.cworth.org (Postfix) with ESMTP id A79BE6DE02DA
\r
6 for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:22:59 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.657 tagged_above=-999 required=5 tests=[AWL=0.005,
\r
12 SPF_NEUTRAL=0.652] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 2tR2-t40iawa for <notmuch@notmuchmail.org>;
\r
16 Sun, 24 Jan 2016 07:22:57 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by arlo.cworth.org (Postfix) with ESMTP id C99F86DE0217
\r
19 for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:22:55 -0800 (PST)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 8291C10005A;
\r
22 Sun, 24 Jan 2016 17:23:02 +0200 (EET)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
\r
25 Notmuch Mail <notmuch@notmuchmail.org>
\r
26 Subject: Re: [PATCH v2 04/16] Provide _notmuch_crypto_{set,get}_gpg_path
\r
27 In-Reply-To: <1453258369-7366-5-git-send-email-dkg@fifthhorseman.net>
\r
28 References: <1453258369-7366-1-git-send-email-dkg@fifthhorseman.net>
\r
29 <1453258369-7366-5-git-send-email-dkg@fifthhorseman.net>
\r
30 User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1
\r
31 (x86_64-unknown-linux-gnu)
\r
32 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
33 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
34 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
35 Date: Sun, 24 Jan 2016 17:23:02 +0200
\r
36 Message-ID: <m2twm357e1.fsf@guru.guru-group.fi>
\r
38 Content-Type: text/plain
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.20
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Sun, 24 Jan 2016 15:22:59 -0000
\r
53 On Wed, Jan 20 2016, Daniel Kahn Gillmor <dkg@fifthhorseman.net> wrote:
\r
55 > Use functions to access the gpg_path for a _notmuch_crypto_t object.
\r
56 > This lets us return sensible defaults based on the state of the user's
\r
59 > notmuch-reply.c | 13 ++++++++++---
\r
60 > notmuch-show.c | 12 ++++++++++--
\r
61 > util/crypto.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
\r
62 > util/crypto.h | 8 +++++++-
\r
63 > 4 files changed, 75 insertions(+), 7 deletions(-)
\r
65 > diff --git a/util/crypto.c b/util/crypto.c
\r
66 > index c18c82c..0b51347 100644
\r
67 > --- a/util/crypto.c
\r
68 > +++ b/util/crypto.c
\r
69 > @@ -21,7 +21,11 @@
\r
71 > #include "notmuch.h"
\r
72 > #include "crypto.h"
\r
73 > +#include "search-path.h"
\r
74 > #include <string.h>
\r
75 > +#include <talloc.h>
\r
77 > +#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
\r
79 > #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
\r
81 duplicate ARRAY_SIZE definition ?
\r
84 > @@ -38,7 +42,7 @@ get_gpg_context (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx)
\r
87 > /* TODO: GMimePasswordRequestFunc */
\r
88 > - crypto->gpgctx = g_mime_gpg_context_new (NULL, crypto->gpgpath ? crypto->gpgpath : "gpg");
\r
89 > + crypto->gpgctx = g_mime_gpg_context_new (NULL, _notmuch_crypto_get_gpg_path(crypto));
\r
90 > if (! crypto->gpgctx) {
\r