From a892382c80656df589c393a93c9df52fdf358275 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 1 Feb 2016 15:39:50 +1900 Subject: [PATCH] [PATCH v3 05/16] Use a blank _notmuch_crypto to choose the default gpg_path --- 57/e990e5491f660154bf6f536abd49c2bc24528a | 70 +++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 57/e990e5491f660154bf6f536abd49c2bc24528a diff --git a/57/e990e5491f660154bf6f536abd49c2bc24528a b/57/e990e5491f660154bf6f536abd49c2bc24528a new file mode 100644 index 000000000..8f6028fa4 --- /dev/null +++ b/57/e990e5491f660154bf6f536abd49c2bc24528a @@ -0,0 +1,70 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 9A00B6DE1B17 + for ; Sun, 31 Jan 2016 12:40:13 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id uigHvZiJDRaC for ; + Sun, 31 Jan 2016 12:40:12 -0800 (PST) +Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108]) + by arlo.cworth.org (Postfix) with ESMTP id E77AD6DE1410 + for ; Sun, 31 Jan 2016 12:40:08 -0800 (PST) +Received: from fifthhorseman.net (ip-64-134-185-108.public.wayport.net + [64.134.185.108]) + by che.mayfirst.org (Postfix) with ESMTPSA id 3A9DDF99A + for ; Sun, 31 Jan 2016 15:40:06 -0500 (EST) +Received: by fifthhorseman.net (Postfix, from userid 1000) + id 3D17F20553; Sun, 31 Jan 2016 15:40:06 -0500 (EST) +From: Daniel Kahn Gillmor +To: Notmuch Mail +Subject: [PATCH v3 05/16] Use a blank _notmuch_crypto to choose the default + gpg_path +Date: Sun, 31 Jan 2016 15:39:50 -0500 +Message-Id: <1454272801-23623-6-git-send-email-dkg@fifthhorseman.net> +X-Mailer: git-send-email 2.7.0.rc3 +In-Reply-To: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net> +References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 31 Jan 2016 20:40:13 -0000 + +This way we're only choosing a default in one place. +--- + notmuch-config.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/notmuch-config.c b/notmuch-config.c +index d252bb2..7cd19a7 100644 +--- a/notmuch-config.c ++++ b/notmuch-config.c +@@ -418,7 +418,8 @@ notmuch_config_open (void *ctx, + } + + if (notmuch_config_get_crypto_gpg_path (config) == NULL) { +- notmuch_config_set_crypto_gpg_path (config, "gpg"); ++ _notmuch_crypto_t crypto = { .gpg_path = NULL }; ++ notmuch_config_set_crypto_gpg_path (config, _notmuch_crypto_get_gpg_path (&crypto)); + } + + /* Whenever we know of configuration sections that don't appear in +-- +2.7.0.rc3 + -- 2.26.2