Rearange the order of the gpg options slightly otherwise it might try to

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 :-)

svn path=/trunk/; revision=13714
This commit is contained in:
Jeffrey Stedfast
2001-10-17 00:12:33 +00:00
committed by Jeffrey Stedfast
parent 7530d8bb88
commit 4d00a548d0
2 changed files with 8 additions and 5 deletions

View File

@ -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.

View File

@ -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;