diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-09-24 06:41:54 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-24 06:41:54 +0800 |
| commit | 1df3e6787e2c30adae410e1eda36907b578a4240 (patch) | |
| tree | 1cca2ced9c319a0231e3d9d267458321104ec4be /camel/camel-pgp-context.c | |
| parent | a02d89a2b723561eaea9a509d1da094a1af67b41 (diff) | |
| download | gsoc2013-evolution-1df3e6787e2c30adae410e1eda36907b578a4240.tar gsoc2013-evolution-1df3e6787e2c30adae410e1eda36907b578a4240.tar.gz gsoc2013-evolution-1df3e6787e2c30adae410e1eda36907b578a4240.tar.bz2 gsoc2013-evolution-1df3e6787e2c30adae410e1eda36907b578a4240.tar.lz gsoc2013-evolution-1df3e6787e2c30adae410e1eda36907b578a4240.tar.xz gsoc2013-evolution-1df3e6787e2c30adae410e1eda36907b578a4240.tar.zst gsoc2013-evolution-1df3e6787e2c30adae410e1eda36907b578a4240.zip | |
Don't even try to alert the user if the session isn't interactive.
2001-09-23 Jeffrey Stedfast <fejj@ximian.com>
* camel-tcp-stream-openssl.c (ssl_verify): Don't even try to alert
the user if the session isn't interactive.
(errlib_error_to_errno): Make the default errno EINTR so that we
act just like CamelTcpStreamSSL.
* camel-pgp-context.c (pgp_sign): When the password is not
provided, set the exception to USER_CANCEL.
(pgp_clearsign): Same.
(pgp_encrypt): And here.
(pgp_decrypt): Here too.
svn path=/trunk/; revision=13088
Diffstat (limited to 'camel/camel-pgp-context.c')
| -rw-r--r-- | camel/camel-pgp-context.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c index 95fafdc652..db87a0dd6c 100644 --- a/camel/camel-pgp-context.c +++ b/camel/camel-pgp-context.c @@ -521,7 +521,7 @@ pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash, passphrase = pgp_get_passphrase (ctx->session, context->priv->type, (char *) userid); if (!passphrase) { - camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cannot sign this message: no password provided")); goto exception; } @@ -696,7 +696,7 @@ pgp_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash passphrase = pgp_get_passphrase (ctx->session, context->priv->type, (char *) userid); if (!passphrase) { - camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cannot sign this message: no password provided")); goto exception; } @@ -1075,7 +1075,7 @@ pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArr passphrase = pgp_get_passphrase (ctx->session, context->priv->type, (char *) userid); if (!passphrase) { - camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cannot encrypt this message: no password provided")); goto exception; } @@ -1262,7 +1262,7 @@ pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream, passphrase = pgp_get_passphrase (ctx->session, context->priv->type, NULL); if (!passphrase) { - camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cannot decrypt this message: no password provided")); goto exception; |