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

diff --git a/db/f34c589ca19b74b08525470677af0ef912f09d b/db/f34c589ca19b74b08525470677af0ef912f09d
new file mode 100644 (file)
index 0000000..d9e81a5
--- /dev/null
+++ b/db/f34c589ca19b74b08525470677af0ef912f09d
@@ -0,0 +1,76 @@
+Return-Path: <david@tethera.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 C0EA26DE0231\r
+ for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 03:49:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.308\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.308 tagged_above=-999 required=5 tests=[AWL=0.243,\r
+  RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] 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 hs622-KacY0x for <notmuch@notmuchmail.org>;\r
+ Wed, 10 Feb 2016 03:49:57 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id E0B4C6DE021E\r
+ for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 03:49:56 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1aTTGl-000853-4d; Wed, 10 Feb 2016 06:49:15 -0500\r
+Received: (nullmailer pid 24917 invoked by uid 1000);\r
+ Wed, 10 Feb 2016 11:49:54 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
+ 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: <1454272801-23623-6-git-send-email-dkg@fifthhorseman.net>\r
+References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1454272801-23623-6-git-send-email-dkg@fifthhorseman.net>\r
+User-Agent: Notmuch/0.21+5~gca076ce (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 10 Feb 2016 07:49:54 -0400\r
+Message-ID: <87oabovl7h.fsf@maritornes.cs.unb.ca>\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 11:49:59 -0000\r
+\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
+d\r