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-smime-context.c | |
| parent | cfa1f110a7dabe96457a17f0e42f632f8b111828 (diff) | |
| download | gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.tar gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.tar.gz gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.tar.bz2 gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.tar.lz gsoc2013-evolution-2bc97c08c1ca8057f03b3b3d872eafa306bab22c.tar.xz 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-smime-context.c')
| -rw-r--r-- | camel/camel-smime-context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c index f087ccdb05..0c3f5de889 100644 --- a/camel/camel-smime-context.c +++ b/camel/camel-smime-context.c @@ -97,13 +97,13 @@ sm_get_passwd(PK11SlotInfo *info, PRBool retry, void *arg) /* we got a password, but its asking again, the password we had was wrong */ if (context->priv->password_tries > 0) { - camel_session_forget_password(((CamelCipherContext *)context)->session, NULL, PK11_GetTokenName(info), NULL); + camel_session_forget_password(((CamelCipherContext *)context)->session, NULL, NULL, PK11_GetTokenName(info), NULL); context->priv->password_tries = 0; } prompt = g_strdup_printf(_("Enter security pass-phrase for `%s'"), PK11_GetTokenName(info)); - pass = camel_session_get_password(((CamelCipherContext *)context)->session, prompt, - CAMEL_SESSION_PASSWORD_SECRET|CAMEL_SESSION_PASSWORD_STATIC, NULL, PK11_GetTokenName(info), ex); + pass = camel_session_get_password(((CamelCipherContext *)context)->session, NULL, NULL, prompt, + PK11_GetTokenName(info), CAMEL_SESSION_PASSWORD_SECRET|CAMEL_SESSION_PASSWORD_STATIC, ex); camel_exception_free(ex); g_free(prompt); if (pass) { |