1 Return-Path: <dkg@fifthhorseman.net>
\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 7C3B46DE09D3
\r
6 for <notmuch@notmuchmail.org>; Fri, 8 Jul 2016 03:13:55 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.054 tagged_above=-999 required=5 tests=[AWL=0.054]
\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 bX7TTGfph43F for <notmuch@notmuchmail.org>;
\r
16 Fri, 8 Jul 2016 03:13:47 -0700 (PDT)
\r
17 Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118])
\r
18 by arlo.cworth.org (Postfix) with ESMTP id 602716DE0355
\r
19 for <notmuch@notmuchmail.org>; Fri, 8 Jul 2016 03:13:12 -0700 (PDT)
\r
20 Received: from fifthhorseman.net (unknown [88.128.80.54])
\r
21 by che.mayfirst.org (Postfix) with ESMTPSA id 70231F997
\r
22 for <notmuch@notmuchmail.org>; Fri, 8 Jul 2016 06:13:11 -0400 (EDT)
\r
23 Received: by fifthhorseman.net (Postfix, from userid 1000)
\r
24 id 970B821132; Fri, 8 Jul 2016 11:27:34 +0200 (CEST)
\r
25 From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
\r
26 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
27 Subject: [PATCH v4 05/16] Choose the default gpg_path with
\r
28 _notmuch_crypto_get_gpg_path (NULL)
\r
29 Date: Fri, 8 Jul 2016 11:27:16 +0200
\r
30 Message-Id: <1467970047-8013-6-git-send-email-dkg@fifthhorseman.net>
\r
31 X-Mailer: git-send-email 2.8.1
\r
32 In-Reply-To: <1467970047-8013-1-git-send-email-dkg@fifthhorseman.net>
\r
33 References: <1467970047-8013-1-git-send-email-dkg@fifthhorseman.net>
\r
34 X-BeenThere: notmuch@notmuchmail.org
\r
35 X-Mailman-Version: 2.1.20
\r
37 List-Id: "Use and development of the notmuch mail system."
\r
38 <notmuch.notmuchmail.org>
\r
39 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
41 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
42 List-Post: <mailto:notmuch@notmuchmail.org>
\r
43 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
44 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
46 X-List-Received-Date: Fri, 08 Jul 2016 10:13:55 -0000
\r
48 This way we're only choosing a default in one place.
\r
50 notmuch-config.c | 5 ++---
\r
51 1 file changed, 2 insertions(+), 3 deletions(-)
\r
53 diff --git a/notmuch-config.c b/notmuch-config.c
\r
54 index e5d42a0..9e4601a 100644
\r
55 --- a/notmuch-config.c
\r
56 +++ b/notmuch-config.c
\r
57 @@ -417,9 +417,8 @@ notmuch_config_open (void *ctx,
\r
58 g_error_free (error);
\r
61 - if (notmuch_config_get_crypto_gpg_path (config) == NULL) {
\r
62 - notmuch_config_set_crypto_gpg_path (config, "gpg");
\r
64 + if (notmuch_config_get_crypto_gpg_path (config) == NULL)
\r
65 + notmuch_config_set_crypto_gpg_path (config, _notmuch_crypto_get_gpg_path (NULL));
\r
67 /* Whenever we know of configuration sections that don't appear in
\r
68 * the configuration file, we add some comments to help the user
\r