diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-08-22 06:45:41 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-08-22 06:45:41 +0800 |
| commit | 9e20b50bd1965b8c26bf6fa59f513c93fe05fa4c (patch) | |
| tree | 5d71ee16d35a119f8aff5687a97a0cd0a7f946f5 | |
| parent | 09a6132a1a04a11c8f1343450fd33c0a855646b6 (diff) | |
| download | gsoc2013-evolution-9e20b50bd1965b8c26bf6fa59f513c93fe05fa4c.tar.gz gsoc2013-evolution-9e20b50bd1965b8c26bf6fa59f513c93fe05fa4c.tar.zst gsoc2013-evolution-9e20b50bd1965b8c26bf6fa59f513c93fe05fa4c.zip | |
Turn on --batch and reenable gpg keyserver lookups. (pgp_decrypt): Disable
2001-08-21 Jeffrey Stedfast <fejj@ximian.com>
* camel-pgp-context.c (pgp_verify): Turn on --batch and reenable
gpg keyserver lookups.
(pgp_decrypt): Disable keyserver lookups if we are disconnected.
svn path=/trunk/; revision=12372
| -rw-r--r-- | camel/ChangeLog | 10 | ||||
| -rw-r--r-- | camel/camel-pgp-context.c | 15 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 6 |
3 files changed, 20 insertions, 11 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 72383e203f..5eaf869253 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-08-21 Jeffrey Stedfast <fejj@ximian.com> + + * camel-pgp-context.c (pgp_verify): Turn on --batch and reenable + gpg keyserver lookups. + (pgp_decrypt): Disable keyserver lookups if we are disconnected. + 2001-08-21 Dan Winship <danw@ximian.com> * camel-folder-thread.c @@ -15,8 +21,8 @@ * providers/local/camel-mbox-summary.c (mbox_summary_sync_full): s/Synchronising/Synchronizing/. - (mbox_summary_sync_quick): Likewise. - * providers/local/camel-spool-summary.c (spool_summary_sync_full): + (mbox_summary_sync_quick): Likewise. * + providers/local/camel-spool-summary.c (spool_summary_sync_full): Likewise. (spool_summary_sync_quick): Likewise. 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 */ diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index fecfd0ba77..8a0f8b6cc9 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -465,13 +465,13 @@ static gboolean pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex) { CamelPop3Store *store = CAMEL_POP3_STORE (service); - + if (clean) camel_pop3_command (store, NULL, ex, "QUIT"); - + if (!CAMEL_SERVICE_CLASS (parent_class)->disconnect (service, clean, ex)) return FALSE; - + return TRUE; } |