aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-02-07 03:12:34 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-02-07 03:12:34 +0800
commitea98c232211430247553c404d20911af2158ef73 (patch)
tree3920c77d0bb2b7832198547ae1d4a4accc8626c9
parentdf342c9259241a70a3faa441aa061d093949bc71 (diff)
downloadgsoc2013-evolution-ea98c232211430247553c404d20911af2158ef73.tar
gsoc2013-evolution-ea98c232211430247553c404d20911af2158ef73.tar.gz
gsoc2013-evolution-ea98c232211430247553c404d20911af2158ef73.tar.bz2
gsoc2013-evolution-ea98c232211430247553c404d20911af2158ef73.tar.lz
gsoc2013-evolution-ea98c232211430247553c404d20911af2158ef73.tar.xz
gsoc2013-evolution-ea98c232211430247553c404d20911af2158ef73.tar.zst
gsoc2013-evolution-ea98c232211430247553c404d20911af2158ef73.zip
Forget the need_id, not the userid. Fixes bug #53908.
2004-02-06 Jeffrey Stedfast <fejj@ximian.com> * camel-gpg-context.c (gpg_ctx_parse_status): Forget the need_id, not the userid. Fixes bug #53908. svn path=/trunk/; revision=24658
-rw-r--r--camel/ChangeLog3
-rw-r--r--camel/camel-gpg-context.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index fca4a08452..f246e8bd53 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,8 @@
2004-02-06 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-gpg-context.c (gpg_ctx_parse_status): Forget the need_id,
+ not the userid. Fixes bug #53908.
+
* camel-store.c (add_special_info): Set a CAMEL_FOLDER_VIRTUAL bit
on the special folder info so our UI can know if it is virtual or
not (meant for vTrash/vJunk).
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index b6ff6cd916..4a0e1151c9 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -789,7 +789,7 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex)
} else if (!strncmp (status, "BAD_PASSPHRASE", 14)) {
gpg->bad_passwds++;
- camel_session_forget_password (gpg->session, NULL, gpg->userid, ex);
+ camel_session_forget_password (gpg->session, NULL, gpg->need_id, ex);
if (gpg->bad_passwds == 3) {
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,