aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-pgp-context.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 7481dcaa39..e1ef7e62f2 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-05 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-pgp-context.c (pgp_verify): Send the
+ --no-auto-key-retrieve argument to gpg so that we don't have to
+ worry about gpg hanging if it can't connect to the key servers,
+ because now it shouldn't even attempt to.
+
2001-07-05 Chris Toshok <toshok@ximian.com>
* camel-tcp-stream-openssl.c (ssl_verify): use
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index a3945a22fe..6651b0b3d6 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -901,6 +901,7 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
argv[i++] = "--verify";
argv[i++] = "--no-tty";
+ argv[i++] = "--no-auto-key-retrieve";
/*argv[i++] = "--verbose";*/
/*argv[i++] = "--yes";*/
/*argv[i++] = "--batch";*/