--- evolution-2.10.0/mail/mail-session.c.e-passwords	2007-03-12 23:41:06.000000000 -0400
+++ evolution-2.10.0/mail/mail-session.c	2007-03-12 23:41:35.000000000 -0400
@@ -679,8 +679,6 @@
 		
 		d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n"));
 
-		e_passwords_cancel();
-		
 		/* flush/cancel pending user messages */
 		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
 			d(printf ("Flusing message request: %s\n", um->prompt));
--- evolution-2.10.0/shell/main.c.e-passwords	2007-03-12 23:39:38.000000000 -0400
+++ evolution-2.10.0/shell/main.c	2007-03-12 23:39:54.000000000 -0400
@@ -565,7 +565,6 @@
 	glade_init ();
 	e_cursors_init ();
 	e_icon_factory_init ();
-	e_passwords_init();
 
 	gtk_window_set_default_icon_name ("evolution");
 
--- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.e-passwords	2007-03-12 23:40:22.000000000 -0400
+++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c	2007-03-12 23:40:36.000000000 -0400
@@ -169,7 +169,6 @@
 
 	alarm_done ();
 
-	e_passwords_shutdown ();
 	gnome_sound_shutdown ();
 
 	return 0;