diff --git a/bindings/python-cffi/tests/conftest.py b/bindings/python-cffi/tests/conftest.py index e322cc64..de7db8e7 100644 --- 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 7347ad31..323a8b65 100644 --- 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 1b079e85..19c2ddb3 100644 --- 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;