diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-12-08 01:23:51 -0500 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2017-12-08 08:06:03 -0400 |
commit | b62045a18680720b407173140d79b459e45e6039 (patch) | |
tree | f17e98231e9dd5b704603b1f8cd87aba260dfcb2 /notmuch.c | |
parent | d3964e81ac98825a025a6120c488ebd73de2a281 (diff) |
indexopts: change _try_decrypt to _decrypt_policy
This terminology makes it clearer what's going on at the API layer,
and paves the way for future changesets that offer more nuanced
decryption policy.
Diffstat (limited to 'notmuch.c')
-rw-r--r-- | notmuch.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -99,8 +99,8 @@ int notmuch_minimal_options (const char *subcommand_name, struct _notmuch_client_indexing_cli_choices indexing_cli_choices = { }; const notmuch_opt_desc_t notmuch_shared_indexing_options [] = { - { .opt_bool = &indexing_cli_choices.try_decrypt, - .present = &indexing_cli_choices.try_decrypt_set, + { .opt_bool = &indexing_cli_choices.decrypt_policy, + .present = &indexing_cli_choices.decrypt_policy_set, .name = "decrypt" }, { } }; @@ -111,21 +111,21 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_u { if (indexing_cli_choices.opts == NULL) indexing_cli_choices.opts = notmuch_database_get_default_indexopts (notmuch); - if (indexing_cli_choices.try_decrypt_set) { + if (indexing_cli_choices.decrypt_policy_set) { notmuch_status_t status; if (indexing_cli_choices.opts == NULL) return NOTMUCH_STATUS_OUT_OF_MEMORY; - status = notmuch_indexopts_set_try_decrypt (indexing_cli_choices.opts, indexing_cli_choices.try_decrypt); + status = notmuch_indexopts_set_decrypt_policy (indexing_cli_choices.opts, indexing_cli_choices.decrypt_policy); if (status != NOTMUCH_STATUS_SUCCESS) { fprintf (stderr, "Error: Failed to set index decryption policy to %s. (%s)\n", - indexing_cli_choices.try_decrypt ? "True" : "False", notmuch_status_to_string (status)); + indexing_cli_choices.decrypt_policy ? "True" : "False", notmuch_status_to_string (status)); notmuch_indexopts_destroy (indexing_cli_choices.opts); indexing_cli_choices.opts = NULL; return status; } } #if (GMIME_MAJOR_VERSION < 3) - if (indexing_cli_choices.opts && notmuch_indexopts_get_try_decrypt (indexing_cli_choices.opts)) { + if (indexing_cli_choices.opts && notmuch_indexopts_get_decrypt_policy (indexing_cli_choices.opts)) { const char* gpg_path = notmuch_config_get_crypto_gpg_path (config); if (gpg_path && strcmp(gpg_path, "gpg")) fprintf (stderr, "Warning: deprecated crypto.gpg_path is set to '%s'\n" |