diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-05-21 17:08:09 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-05-21 17:08:09 +0800 |
| commit | 2bc97c08c1ca8057f03b3b3d872eafa306bab22c (patch) | |
| tree | b290bc21cafc1b26ac44a5296a58748c0cad439c /camel/camel-gpg-context.c | |
| parent | cfa1f110a7dabe96457a17f0e42f632f8b111828 (diff) | |
| download | gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.tar.gz gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.tar.zst gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.zip | |
added a 'domain' argument, and rearragned arguments to be prettier and
2004-05-21 Not Zed <NotZed@Ximian.com>
* camel-session.c (camel_session_get_password): added a 'domain'
argument, and rearragned arguments to be prettier and more
consistent. Fixed all callers.
(camel_session_forget_password): added a domain argument. Fixed
all callers.
** See #58376.
* camel-folder.c (set_message_flags): if system flags change, then
don't trigger a folder changed event.
* camel-folder-summary.h (CAMEL_MESSAGE_SYSTEM_MASK): added this
to indicate which flags are internal/apps not interested in.
* camel-folder.c (filter_free): rearrange and use some helpers.
(folder_changed): if we're frozen, dont go firing off threads to
do any processing on each change, wait until we're called
unfrozen. Slight code rearragnement.
(filter_filter): add progress to junk learn/unlearn, and separate
them.
svn path=/trunk/; revision=26029
Diffstat (limited to 'camel/camel-gpg-context.c')
| -rw-r--r-- | camel/camel-gpg-context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index 5e3632cbe1..b69feb9277 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -772,7 +772,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, CAMEL_SESSION_PASSWORD_SECRET, NULL, gpg->need_id, ex)) && !gpg->utf8) { + if ((passwd = camel_session_get_password (gpg->session, NULL, NULL, prompt, gpg->need_id, CAMEL_SESSION_PASSWORD_SECRET, ex)) && !gpg->utf8) { char *opasswd = passwd; if ((passwd = g_locale_to_utf8 (passwd, -1, &nread, &nwritten, NULL))) { @@ -800,7 +800,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->need_id, ex); + camel_session_forget_password (gpg->session, NULL, NULL, gpg->need_id, ex); if (gpg->bad_passwds == 3) { camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE, |