diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-07-14 15:12:00 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-07-14 21:23:52 -0300 |
| commit | e142de643d3bb4354f70e1490a97b491d1116e95 (patch) | |
| tree | cb192df604b692bc415584c2c66e993efa6a7864 /notmuch-config.c | |
| parent | 8492298a613e8e666d0f3054dadcb98b72a65ae4 (diff) | |
config: deprecate/drop crypto.gpg_path under gmime 2.6/3.0
gmime 3.0 no longer offers a means to set the path for gpg.
Users can set $PATH anyway if they want to pick a
differently-installed gpg (e.g. /usr/local/bin/gpg), so this isn't
much of a reduction in functionality.
The one main difference is for people who have tried to use "gpg2" to
make use of gpg 2.1, but that isn't usefully co-installable anyway.
Diffstat (limited to 'notmuch-config.c')
| -rw-r--r-- | notmuch-config.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/notmuch-config.c b/notmuch-config.c index e4aaef61..cb9529b9 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -104,10 +104,20 @@ static const char search_config_comment[] = static const char crypto_config_comment[] = " Cryptography related configuration\n" "\n" - " The following option is supported here:\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\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 { char *filename; @@ -460,10 +470,12 @@ 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. */ @@ -752,6 +764,7 @@ 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) { @@ -764,6 +777,7 @@ notmuch_config_set_crypto_gpg_path (notmuch_config_t *config, { _config_set (config, &config->crypto_gpg_path, "crypto", "gpg_path", gpg_path); } +#endif /* Given a configuration item of the form <group>.<key> return the |