aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog14
-rw-r--r--mail/mail-config.c2
-rw-r--r--mail/mail-session.c12
-rw-r--r--mail/main.c2
4 files changed, 21 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ddd57b115f..298e52ba82 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,17 @@
+2002-12-09 Chris Toshok <toshok@ximian.com>
+
+ * mail-session.c (pass_response): pass "Mail" to e_passwords_*.
+ (do_get_pass): same.
+ (main_forget_password): same.
+ (mail_session_get_password): same.
+ (mail_session_remember_password): same.
+ (mail_session_forget_password): same.
+
+ * mail-config.c (mail_config_write_on_exit): pass "Mail" to
+ e_passwords_*.
+
+ * main.c (main): e_passwords_init is gone.
+
2002-12-03 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (guess_me_from_accounts): Use the same logic as
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 875023ae7f..b7f5ce8356 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1299,7 +1299,7 @@ mail_config_write_on_exit (void)
}
/* then we clear out our component passwords */
- e_passwords_clear_component_passwords ();
+ e_passwords_clear_component_passwords ("Mail");
/* then we remember them */
accounts = mail_config_get_accounts ();
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 8858af01f5..4b524abdc0 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -205,7 +205,7 @@ pass_response(GtkDialog *dialogue, int button, void *data)
/* should we remember it between sessions? */
if (remember)
- e_passwords_remember_password (m->key);
+ e_passwords_remember_password ("Mail", m->key);
}
break; }
default:
@@ -284,7 +284,7 @@ do_get_pass(struct _mail_msg *mm)
if (account)
m->result = g_strdup(account->source->url);
} else if (m->key) {
- m->result = e_passwords_get_password(m->key);
+ m->result = e_passwords_get_password ("Mail", m->key);
if (m->result == NULL) {
if (mail_session->interactive) {
request_password(m);
@@ -359,7 +359,7 @@ main_forget_password (CamelSession *session, CamelService *service, const char *
{
char *key = make_key (service, item);
- e_passwords_forget_password (key);
+ e_passwords_forget_password ("Mail", key);
g_free (key);
}
@@ -845,7 +845,7 @@ mail_session_get_password (const char *url_string)
simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
camel_url_free (url);
- passwd = e_passwords_get_password (simple_url);
+ passwd = e_passwords_get_password ("Mail", simple_url);
g_free (simple_url);
@@ -878,7 +878,7 @@ mail_session_remember_password (const char *url_string)
simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
camel_url_free (url);
- e_passwords_remember_password (simple_url);
+ e_passwords_remember_password ("Mail", simple_url);
g_free (simple_url);
}
@@ -886,7 +886,7 @@ mail_session_remember_password (const char *url_string)
void
mail_session_forget_password (const char *key)
{
- e_passwords_forget_password (key);
+ e_passwords_forget_password ("Mail", key);
}
void
diff --git a/mail/main.c b/mail/main.c
index 9e17423487..692689330a 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -130,8 +130,6 @@ main (int argc, char *argv [])
e_proxy_init ();
- e_passwords_init ("Mail");
-
mail_config_init ();
mail_msg_init ();