diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2019-05-02 09:19:36 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-05-03 06:55:04 -0300 |
| commit | 096d45a878ba9606f1677f66d346b14c3c274fa5 (patch) | |
| tree | 16a875121b5354ba37c5667d37ec06f4254085b4 /notmuch-config.c | |
| parent | 35e21bfb6f5fa4a0b61a71860e1f7f04d9e3e274 (diff) | |
gmime-cleanup: remove obsolete gpg_path configuration option and crypto contexts
Note that we do keep ignoring the gpg_path configuration option,
though, to avoid breakage of existing installations. It is ignored
like any other unknown configuration option, but we at least document
that it is ignored so that people who find it in their legacy configs
can know that it's safe to drop.
signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'notmuch-config.c')
| -rw-r--r-- | notmuch-config.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/notmuch-config.c b/notmuch-config.c index bf77cc9d..e029e306 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -104,19 +104,11 @@ static const char search_config_comment[] = static const char crypto_config_comment[] = " Cryptography related configuration\n" "\n" -#if (GMIME_MAJOR_VERSION < 3) - " The following *deprecated* option is currently supported:\n" - "\n" - "\tgpg_path\n" - "\t\tbinary name or full path to invoke gpg.\n" - "\t\tNOTE: In a future build, this option will be ignored.\n" -#else " The following old option is now ignored:\n" "\n" "\tgpgpath\n" "\t\tThis option was used by older builds of notmuch to choose\n" "\t\tthe version of gpg to use.\n" -#endif "\t\tSetting $PATH is a better approach.\n"; struct _notmuch_config { @@ -470,12 +462,6 @@ notmuch_config_open (void *ctx, g_error_free (error); } -#if (GMIME_MAJOR_VERSION < 3) - if (notmuch_config_get_crypto_gpg_path (config) == NULL) { - notmuch_config_set_crypto_gpg_path (config, "gpg"); - } -#endif - /* Whenever we know of configuration sections that don't appear in * the configuration file, we add some comments to help the user * understand what can be done. */ @@ -776,21 +762,6 @@ notmuch_config_set_search_exclude_tags (notmuch_config_t *config, &(config->search_exclude_tags)); } -#if (GMIME_MAJOR_VERSION < 3) -const char * -notmuch_config_get_crypto_gpg_path (notmuch_config_t *config) -{ - return _config_get (config, &config->crypto_gpg_path, "crypto", "gpg_path"); -} - -void -notmuch_config_set_crypto_gpg_path (notmuch_config_t *config, - const char *gpg_path) -{ - _config_set (config, &config->crypto_gpg_path, "crypto", "gpg_path", gpg_path); -} -#endif - /* Given a configuration item of the form <group>.<key> return the * component group and key. If any error occurs, print a message on |