aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/camel-pgp-context.c9
2 files changed, 8 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 915b355a74..aac9cb55d7 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,9 @@
2001-10-16 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-pgp-context.c (pgp_verify): Rearange the order of the gpg
+ options slightly otherwise it might try to use "--no-tty" as the
+ filename to verify :-)
+
* camel-object.[c,h]: If CAMEL_DEBUG is defined, print some useful
ref/unref info.
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index 575b6006ac..d4ed0c0a2c 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -920,16 +920,15 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
argv[i++] = "--verbose";
argv[i++] = "--no-secmem-warning";
argv[i++] = "--no-greeting";
+ argv[i++] = "--no-tty";
+ if (!camel_session_is_online (ctx->session))
+ argv[i++] = "--no-auto-key-retrieve";
+
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";
-
if (sigstream != NULL)
argv[i++] = sigfile;