X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch.c;h=de85041b4add2bb4bdcc18c4080f22414799163c;hb=b7ac4c05e118047442378f58eeb69d43bd1cbdb1;hp=7810b68569f5eb47be8d54bca78aa5206e6cd741;hpb=c3a683299d4c27d6eadaacf4fb516f73a6c69fc3;p=notmuch diff --git a/notmuch.c b/notmuch.c index 7810b685..de85041b 100644 --- a/notmuch.c +++ b/notmuch.c @@ -112,7 +112,7 @@ const notmuch_opt_desc_t notmuch_shared_indexing_options [] = { notmuch_status_t -notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_unused(notmuch_config_t *config)) +notmuch_process_shared_indexing_options (notmuch_database_t *notmuch) { if (indexing_cli_choices.opts == NULL) indexing_cli_choices.opts = notmuch_database_get_default_indexopts (notmuch); @@ -129,14 +129,6 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_u return status; } } -#if (GMIME_MAJOR_VERSION < 3) - 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" - "\tbut ignoring (use $PATH instead)\n", gpg_path); - } -#endif return NOTMUCH_STATUS_SUCCESS; }