aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog9
-rw-r--r--camel/camel-pgp-context.c11
2 files changed, 20 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 6f437277bd..fffedf63d9 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-29 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-pgp-context.c (pgp_sign): Add --no-secmem-warning and
+ --no-greeting to the gpg command-line options.
+ (pgp_clearsign): Same.
+ (pgp_verify): Here too.
+ (pgp_encrypt): And here.
+ (pgp_decrypt): And finally here.
+
2001-09-28 Jeffrey Stedfast <fejj@ximian.com>
* camel-filter-search.c (get_source): Same here.
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index 5983dd71bb..9a5fa74e0e 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -573,6 +573,8 @@ pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
}
argv[i++] = "--verbose";
+ argv[i++] = "--no-secmem-warning";
+ argv[i++] = "--no-greeting";
argv[i++] = "--yes";
argv[i++] = "--batch";
@@ -745,6 +747,8 @@ pgp_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash
}
argv[i++] = "--verbose";
+ argv[i++] = "--no-secmem-warning";
+ argv[i++] = "--no-greeting";
argv[i++] = "--yes";
argv[i++] = "--batch";
@@ -913,6 +917,8 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
argv[i++] = "gpg";
argv[i++] = "--verbose";
+ argv[i++] = "--no-secmem-warning";
+ argv[i++] = "--no-greeting";
argv[i++] = "--yes";
argv[i++] = "--batch";
@@ -1105,6 +1111,8 @@ pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArr
g_ptr_array_add (argv, "gpg");
g_ptr_array_add (argv, "--verbose");
+ g_ptr_array_add (argv, "--no-secmem-warning");
+ g_ptr_array_add (argv, "--no-greeting");
g_ptr_array_add (argv, "--yes");
g_ptr_array_add (argv, "--batch");
@@ -1278,7 +1286,10 @@ pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream,
switch (context->priv->type) {
case CAMEL_PGP_TYPE_GPG:
argv[i++] = "gpg";
+
argv[i++] = "--verbose";
+ argv[i++] = "--no-secmem-warning";
+ argv[i++] = "--no-greeting";
argv[i++] = "--yes";
argv[i++] = "--batch";