diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-01-20 06:03:22 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-01-20 06:03:22 +0800 |
| commit | 58f3de4588a027e43d0a40bb89ae00384d9d2037 (patch) | |
| tree | c370b0ef44d0f9f6747313dde32d1839dd129215 | |
| parent | a2148a0d42d59a5baab291a2bb4b501c4b6e6e87 (diff) | |
| download | gsoc2013-evolution-58f3de4588a027e43d0a40bb89ae00384d9d2037.tar gsoc2013-evolution-58f3de4588a027e43d0a40bb89ae00384d9d2037.tar.gz gsoc2013-evolution-58f3de4588a027e43d0a40bb89ae00384d9d2037.tar.bz2 gsoc2013-evolution-58f3de4588a027e43d0a40bb89ae00384d9d2037.tar.lz gsoc2013-evolution-58f3de4588a027e43d0a40bb89ae00384d9d2037.tar.xz gsoc2013-evolution-58f3de4588a027e43d0a40bb89ae00384d9d2037.tar.zst gsoc2013-evolution-58f3de4588a027e43d0a40bb89ae00384d9d2037.zip | |
** See bug #52899.
2004-01-20 Not Zed <NotZed@Ximian.com>
** See bug #52899.
* camel-gpg-context.c (gpg_ctx_parse_status): use need_id as the
password key, not userid.
svn path=/trunk/; revision=24315
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-gpg-context.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 20c4a6be04..fcf9d3c454 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2004-01-20 Not Zed <NotZed@Ximian.com> + + ** See bug #52899. + + * camel-gpg-context.c (gpg_ctx_parse_status): use need_id as the + password key, not userid. + 2004-01-19 Siviaah Nallagatla <snallagatla@novell.com> * providers/groupwise/camel-gw-listener.c ( remove_calender_tasks_sources, diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index f596dfe519..d142c11c40 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -761,7 +761,7 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex) prompt = g_strdup_printf (_("You need a passphrase to unlock the key for\n" "user: \"%s\""), name); - if ((passwd = camel_session_get_password (gpg->session, prompt, FALSE, TRUE, NULL, gpg->userid, ex)) && !gpg->utf8) { + if ((passwd = camel_session_get_password (gpg->session, prompt, FALSE, TRUE, NULL, gpg->need_id, ex)) && !gpg->utf8) { char *opasswd = passwd; if ((passwd = g_locale_to_utf8 (passwd, -1, &nread, &nwritten, NULL))) { |