X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=1d283e260f1828ce784dae12d7e53b8e554011b1;hp=7d5eeae4f035dca7191132a067b58e3b8f05d5f4;hb=e4890b5bf9e2260b36bcc36ddb77d8e97e2abe7d;hpb=798aa789b5d117cf11697bc97dd982bd5a2c2ac8 diff --git a/notmuch.c b/notmuch.c index 7d5eeae4..1d283e26 100644 --- a/notmuch.c +++ b/notmuch.c @@ -103,6 +103,7 @@ const notmuch_opt_desc_t notmuch_shared_indexing_options [] = { .present = &indexing_cli_choices.decrypt_policy_set, .keywords = (notmuch_keyword_t []){ { "false", NOTMUCH_DECRYPT_FALSE }, { "true", NOTMUCH_DECRYPT_TRUE }, + { "auto", NOTMUCH_DECRYPT_AUTO }, { 0, 0 } }, .name = "decrypt" }, { } @@ -128,7 +129,7 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_u } } #if (GMIME_MAJOR_VERSION < 3) - if (indexing_cli_choices.opts && notmuch_indexopts_get_decrypt_policy (indexing_cli_choices.opts) == NOTMUCH_DECRYPT_TRUE) { + if (indexing_cli_choices.opts && notmuch_indexopts_get_decrypt_policy (indexing_cli_choices.opts) != NOTMUCH_DECRYPT_FALSE) { 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"