diff options
Diffstat (limited to 'camel/camel-pgp-context.c')
| -rw-r--r-- | camel/camel-pgp-context.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c index 42d0ad35b0..3d048039d1 100644 --- a/camel/camel-pgp-context.c +++ b/camel/camel-pgp-context.c @@ -911,16 +911,16 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream, case CAMEL_PGP_TYPE_GPG: argv[i++] = "gpg"; + argv[i++] = "--verbose"; + argv[i++] = "--yes"; + argv[i++] = "--batch"; + argv[i++] = "--verify"; argv[i++] = "--no-tty"; - /*if (!camel_session_is_online (ctx->session))*/ - argv[i++] = "--no-auto-key-retrieve"; - - /*argv[i++] = "--verbose";*/ - /*argv[i++] = "--yes";*/ - /*argv[i++] = "--batch";*/ + if (!camel_session_is_online (ctx->session)) + argv[i++] = "--no-auto-key-retrieve"; if (sigstream != NULL) argv[i++] = sigfile; @@ -1313,6 +1313,9 @@ pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream, argv[i++] = "--yes"; argv[i++] = "--batch"; + if (!camel_session_is_online (ctx->session)) + argv[i++] = "--no-auto-key-retrieve"; + argv[i++] = "--output"; argv[i++] = "-"; /* output to stdout */ |