Re: [PATCH v3 05/16] Use a blank _notmuch_crypto to choose the default gpg_path

diff --git a/0f/03e5906391e57787b7eceec19e57cce4f307ee b/0f/03e5906391e57787b7eceec19e57cce4f307ee
new file mode 100644 (file)
index 0000000..8954b08
--- /dev/null
+++ b/0f/03e5906391e57787b7eceec19e57cce4f307ee
@@ -0,0 +1,79 @@
+Return-Path: <dkg@fifthhorseman.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 0C8D46DE1104\r
+ for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 08:37:56 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.018\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.018 tagged_above=-999 required=5\r
+ tests=[AWL=-0.018] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id HJ_2yq-Cclcd for <notmuch@notmuchmail.org>;\r
+ Wed, 10 Feb 2016 08:37:54 -0800 (PST)\r
+Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 6A2AB6DE0BF6\r
+ for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 08:37:54 -0800 (PST)\r
+Received: from fifthhorseman.net (unknown [38.109.115.130])\r
+ by che.mayfirst.org (Postfix) with ESMTPSA id 71100F997;\r
+ Wed, 10 Feb 2016 11:37:51 -0500 (EST)\r
+Received: by fifthhorseman.net (Postfix, from userid 1000)\r
+ id E15F71FF3A; Wed, 10 Feb 2016 11:37:52 -0500 (EST)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: David Bremner <david@tethera.net>, Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH v3 05/16] Use a blank _notmuch_crypto to choose the\r
+ default gpg_path\r
+In-Reply-To: <87oabovl7h.fsf@maritornes.cs.unb.ca>\r
+References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1454272801-23623-6-git-send-email-dkg@fifthhorseman.net>\r
+ <87oabovl7h.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.21+72~gd8c4f1c (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 10 Feb 2016 11:37:52 -0500\r
+Message-ID: <877fico71b.fsf@alice.fifthhorseman.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 10 Feb 2016 16:37:56 -0000\r
+\r
+On Wed 2016-02-10 06:49:54 -0500, David Bremner wrote:\r
+> Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:\r
+>\r
+>> This way we're only choosing a default in one place.\r
+>> ---\r
+>>  notmuch-config.c | 3 ++-\r
+>>  1 file changed, 2 insertions(+), 1 deletion(-)\r
+>>\r
+>> diff --git a/notmuch-config.c b/notmuch-config.c\r
+>> index d252bb2..7cd19a7 100644\r
+>> --- a/notmuch-config.c\r
+>> +++ b/notmuch-config.c\r
+>> @@ -418,7 +418,8 @@ notmuch_config_open (void *ctx,\r
+>>      }\r
+>>  \r
+>>      if (notmuch_config_get_crypto_gpg_path (config) == NULL) {\r
+>> -   notmuch_config_set_crypto_gpg_path (config, "gpg");\r
+>> +   _notmuch_crypto_t crypto = { .gpg_path = NULL };\r
+>> +   notmuch_config_set_crypto_gpg_path (config, _notmuch_crypto_get_gpg_path (&crypto));\r
+>>      }\r
+>\r
+> I'm not sure if it's worth it, but this particular usage would be\r
+> cleaner if _notmuch_crypto_get_path allowed a NULL argument.\r
+\r
+Agreed; this change will be in my v4 series.\r
+\r
+        --dkg\r