[PATCH v2 05/16] Use a blank _notmuch_crypto to choose the default gpg_path

diff --git a/49/9b59ca72818188cd52e83d521dd114e1cfe428 b/49/9b59ca72818188cd52e83d521dd114e1cfe428
new file mode 100644 (file)
index 0000000..f182706
--- /dev/null
+++ b/49/9b59ca72818188cd52e83d521dd114e1cfe428
@@ -0,0 +1,69 @@
+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 D1D786DE1601\r
+ for <notmuch@notmuchmail.org>; Tue, 19 Jan 2016 18:53:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.023\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.023 tagged_above=-999 required=5\r
+ tests=[AWL=-0.023] 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 o8HbBTfU5oTB for <notmuch@notmuchmail.org>;\r
+ Tue, 19 Jan 2016 18:53:28 -0800 (PST)\r
+Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 940A16DE173B\r
+ for <notmuch@notmuchmail.org>; Tue, 19 Jan 2016 18:53:16 -0800 (PST)\r
+Received: from fifthhorseman.net (unknown [38.109.115.130])\r
+ by che.mayfirst.org (Postfix) with ESMTPSA id B2940F98B\r
+ for <notmuch@notmuchmail.org>; Tue, 19 Jan 2016 21:53:12 -0500 (EST)\r
+Received: by fifthhorseman.net (Postfix, from userid 1000)\r
+ id DC72E2036B; Tue, 19 Jan 2016 18:53:10 -0800 (PST)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v2 05/16] Use a blank _notmuch_crypto to choose the default\r
+ gpg_path\r
+Date: Tue, 19 Jan 2016 21:52:38 -0500\r
+Message-Id: <1453258369-7366-6-git-send-email-dkg@fifthhorseman.net>\r
+X-Mailer: git-send-email 2.7.0.rc3\r
+In-Reply-To: <1453258369-7366-1-git-send-email-dkg@fifthhorseman.net>\r
+References: <1453258369-7366-1-git-send-email-dkg@fifthhorseman.net>\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, 20 Jan 2016 02:53:30 -0000\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
+     /* Whenever we know of configuration sections that don't appear in\r
+-- \r
+2.7.0.rc3\r
+\r