Drop deprecated/unused crypto.gpg_path

crypto.gpg_path was only used when we built against gmime versions
before 3.0.  Since we now depend on gmime 3.0.3 or later, it is
meaningless.

The removal of the field from the _notmuch_config struct would be an
ABI change if that struct were externally exposed, but it is not, so
it's safe to unilaterally remove it.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

diff --git a/bindings/python-cffi/tests/conftest.py b/bindings/python-cffi/tests/conftest.py
index e322cc647167e917b99a8a537b4c9b1b7100a04b..de7db8e795d04cce1022a94722f7a66e250164fe 100644 (file)
--- a/bindings/python-cffi/tests/conftest.py
+++ b/bindings/python-cffi/tests/conftest.py
@@ -78,8 +78,6 @@ def maildir(tmppath):
             exclude_tags=deleted;spam;
             [maildir]
             synchronize_flags=true
-            [crypto]
-            gpg_path=gpg
             """.format(tmppath=tmppath)))
     return MailDir(tmppath)
 

diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst
index 7347ad316ef16bef6dd1fe7b0789c1e697bef122..323a8b6586ab4777553e043327b72f2b19d7eaeb 100644 (file)
--- a/doc/man1/notmuch-config.rst
+++ b/doc/man1/notmuch-config.rst
@@ -134,14 +134,6 @@ The available configuration items are described below.
 
     Default: ``true``.
 
-**crypto.gpg_path**
-    Name (or full path) of gpg binary to use in verification and
-    decryption of PGP/MIME messages.  NOTE: This configuration item is
-    deprecated, and will be ignored if notmuch is built against GMime
-    3.0 or later.
-
-    Default: ``gpg``.
-
 **index.decrypt** **[STORED IN DATABASE]**
     Policy for decrypting encrypted messages during indexing.  Must be
     one of: ``false``, ``auto``, ``nostash``, or ``true``.

diff --git a/notmuch-config.c b/notmuch-config.c
index 1b079e857d030e894dd4daed5fa5b306b9e1e2b6..19c2ddb36a292d1687c61d98d7072e10753029fb 100644 (file)
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -119,7 +119,6 @@ struct _notmuch_config {
     bool is_new;
 
     char *database_path;
-    char *crypto_gpg_path;
     char *user_name;
     char *user_primary_email;
     const char **user_other_email;