diff options
| -rw-r--r-- | mail/ChangeLog | 1 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 | ||||
| -rw-r--r-- | mail/mail-mt.c | 24 | ||||
| -rw-r--r-- | mail/mail-session.c | 15 | ||||
| -rw-r--r-- | mail/mail-session.h | 2 |
5 files changed, 14 insertions, 30 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8ffb384765..eb3e785a7c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -2,6 +2,7 @@ * mail-session.c (make_key): Don't make the key url:item if we have the url, just make it url. This fixes bug #5339. + (mail_session_set_password): Removed. 2001-07-25 Peter Williams <peterw@ximian.com> diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 51a9f16b40..b70e12185e 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -860,9 +860,7 @@ enumerate_msg (MessageList *ml, const char *uid, gpointer data) static EMsgComposer * forward_get_composer (CamelMimeMessage *message, const char *subject) { - const CamelInternetAddress *to_addrs, *cc_addrs; const MailConfigAccount *account = NULL; - const GSList *accounts = NULL; EMsgComposer *composer; if (message) { diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 84029cba5e..9f330b217a 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -395,21 +395,23 @@ struct _pass_msg { }; /* libgnomeui's idea of an api/gui is very weird ... hence this dumb hack */ -static void focus_on_entry(GtkWidget *widget, void *user_data) +static void +focus_on_entry (GtkWidget *widget, void *user_data) { - if (GTK_IS_ENTRY(widget)) - gtk_widget_grab_focus(widget); + if (GTK_IS_ENTRY (widget)) + gtk_widget_grab_focus (widget); } -static void pass_got(char *string, void *data) +static void +pass_got (char *string, void *data) { struct _pass_msg *m = data; - + if (string) { - MailConfigAccount *mca; - + const MailConfigAccount *mca; + m->result = g_strdup (string); - + mca = mail_config_get_account_by_source_url (m->service_url); mail_config_service_set_save_passwd (mca->source, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m->tb))); @@ -420,14 +422,14 @@ static void do_get_pass(struct _mail_msg *mm) { struct _pass_msg *m = (struct _pass_msg *)mm; + const MailConfigAccount *mca; GtkWidget *dialogue; GtkWidget *tb; - MailConfigAccount *mca; - + /* this api is just awful ... hence the hacks */ dialogue = gnome_request_dialog(m->secret, m->prompt, NULL, 0, pass_got, m, NULL); - + /* Remember the password? */ mca = mail_config_get_account_by_source_url (m->service_url); tb = gtk_check_button_new_with_label (_("Remember this password")); diff --git a/mail/mail-session.c b/mail/mail-session.c index b0d289fbb7..c511885a9d 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -460,18 +460,3 @@ mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data, gnome_config_private_clean_section ("/Evolution/Passwords"); gnome_config_sync (); } - -void -mail_session_set_password (const char *url_string, const char *password) -{ - GHashTable *passwords = MAIL_SESSION (session)->passwords; - char *simple_url; - CamelURL *url; - - url = camel_url_new (url_string, NULL); - simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); - camel_url_free (url); - - g_hash_table_insert (passwords, simple_url, g_strdup (password)); -} - diff --git a/mail/mail-session.h b/mail/mail-session.h index fa622be731..d23c4eaaf3 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -44,8 +44,6 @@ void mail_session_remember_password (const char *url); void mail_session_forget_password (const char *key); -void mail_session_set_password (const char *url, const char *password); - extern CamelSession *session; #ifdef __cplusplus |