diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-07-04 21:55:30 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-07-04 22:20:54 +0800 |
| commit | 99d492b8284fa467f2b8ad3e6b637e10258d1cc2 (patch) | |
| tree | eeabd62681bd3cbf0e903c509dbafeec75f804d1 /mail | |
| parent | 56e3e6818693118b1a33c682ff71ec7d561c46d1 (diff) | |
| download | gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar.gz gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar.zst gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.zip | |
Adapt to CamelSession and e-passwords changes.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-session.c | 14 | ||||
| -rw-r--r-- | mail/em-account-editor.c | 7 |
2 files changed, 5 insertions, 16 deletions
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index 1a3b9e8c0a..44bbd8d0aa 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -609,7 +609,6 @@ mail_session_finalize (GObject *object) static gchar * mail_session_get_password (CamelSession *session, CamelService *service, - const gchar *domain, const gchar *prompt, const gchar *item, guint32 flags, @@ -631,10 +630,7 @@ mail_session_get_password (CamelSession *session, gchar *key = mail_session_make_key (service, item); EAccountService *config_service = NULL; - if (domain == NULL) - domain = "Mail"; - - ret = e_passwords_get_password (domain, key); + ret = e_passwords_get_password (NULL, key); if (ret == NULL || (flags & CAMEL_SESSION_PASSWORD_REPROMPT)) { gboolean remember; @@ -696,11 +692,11 @@ mail_session_get_password (CamelSession *session, eflags |= E_PASSWORDS_DISABLE_REMEMBER; ret = e_passwords_ask_password ( - title, domain, key, prompt, + title, NULL, key, prompt, eflags, &remember, NULL); if (!ret) - e_passwords_forget_password (domain, key); + e_passwords_forget_password (NULL, key); g_free (title); @@ -729,16 +725,14 @@ mail_session_get_password (CamelSession *session, static gboolean mail_session_forget_password (CamelSession *session, CamelService *service, - const gchar *domain, const gchar *item, GError **error) { gchar *key; - domain = (domain != NULL) ? domain : "Mail"; key = mail_session_make_key (service, item); - e_passwords_forget_password (domain, key); + e_passwords_forget_password (NULL, key); g_free (key); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index c6bef76187..867a8378dc 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -3838,19 +3838,14 @@ forget_password_if_needed (EAccount *original_account, EAccount *modified_accoun (orig_url && !modif_url)) { CamelURL *url; gchar *url_str; - const gchar *auth_domain; url = camel_url_new (orig_url, NULL); if (!url) return; - auth_domain = camel_url_get_param (url, "auth-domain"); - if (!auth_domain) - auth_domain = "Mail"; - url_str = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); if (url_str) - e_passwords_forget_password (auth_domain, url_str); + e_passwords_forget_password (NULL, url_str); g_free (url_str); camel_url_free (url); |