diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-06-29 00:36:29 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-06-29 00:36:29 +0800 |
| commit | d462bdb71781dc071373feea544b9db172899ce8 (patch) | |
| tree | 39bc469eb70e2176c05d2a05e4d11d88d8688306 | |
| parent | 292847cc9694ae7041af1390f4d1956d23f20c6a (diff) | |
| download | gsoc2013-evolution-d462bdb71781dc071373feea544b9db172899ce8.tar gsoc2013-evolution-d462bdb71781dc071373feea544b9db172899ce8.tar.gz gsoc2013-evolution-d462bdb71781dc071373feea544b9db172899ce8.tar.bz2 gsoc2013-evolution-d462bdb71781dc071373feea544b9db172899ce8.tar.lz gsoc2013-evolution-d462bdb71781dc071373feea544b9db172899ce8.tar.xz gsoc2013-evolution-d462bdb71781dc071373feea544b9db172899ce8.tar.zst gsoc2013-evolution-d462bdb71781dc071373feea544b9db172899ce8.zip | |
Don't use --no-auto-key-retrieve, this option has apparently been
2002-06-28 Jeffrey Stedfast <fejj@ximian.com>
* camel-gpg-context.c (gpg_ctx_get_argv): Don't use
--no-auto-key-retrieve, this option has apparently been deprecated
in gpg 1.0.7.
svn path=/trunk/; revision=17321
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-gpg-context.c | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 07095f7426..d08438822d 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2002-06-28 Jeffrey Stedfast <fejj@ximian.com> + + * camel-gpg-context.c (gpg_ctx_get_argv): Don't use + --no-auto-key-retrieve, this option has apparently been deprecated + in gpg 1.0.7. + 2002-06-27 Jeffrey Stedfast <fejj@ximian.com> * camel-gpg-context.c (gpg_ctx_op_step): Loop on our reads while diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index c847b9c66a..d310b3c175 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -516,8 +516,12 @@ gpg_ctx_get_argv (struct _GpgCtx *gpg, int status_fd, char **sfd, int passwd_fd, g_ptr_array_add (argv, "-"); break; case GPG_CTX_MODE_VERIFY: - if (!camel_session_is_online (gpg->session)) - g_ptr_array_add (argv, "--no-auto-key-retrieve"); + if (!camel_session_is_online (gpg->session)) { + /* this is a deprecated flag to gpg since 1.0.7 */ + /*g_ptr_array_add (argv, "--no-auto-key-retrieve");*/ + g_ptr_array_add (argv, "--keyserver-options"); + g_ptr_array_add (argv, "no-auto-key-retrieve"); + } g_ptr_array_add (argv, "--verify"); if (gpg->sigfile) g_ptr_array_add (argv, gpg->sigfile); @@ -958,6 +962,8 @@ gpg_ctx_op_step (struct _GpgCtx *gpg, CamelException *ex) if (gpg_ctx_parse_status (gpg, ex) == -1) return -1; + } else { + gpg->complete = TRUE; } } @@ -1106,7 +1112,7 @@ gpg_ctx_op_complete (struct _GpgCtx *gpg) } static gboolean -gpg_ctx_op_is_exited (struct _GpgCtx *gpg) +gpg_ctx_op_exited (struct _GpgCtx *gpg) { pid_t retval; int status; @@ -1314,7 +1320,7 @@ gpg_verify (CamelCipherContext *context, CamelCipherHash hash, goto exception; } - while (!gpg_ctx_op_complete (gpg) && !gpg_ctx_op_is_exited (gpg)) { + while (!gpg_ctx_op_complete (gpg) && !gpg_ctx_op_exited (gpg)) { if (camel_operation_cancel_check (NULL)) { camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled.")); |