Merge revisions 36016:36533 from trunk.

svn path=/branches/kill-bonobo/; revision=36534

1 files changed, 18 insertions, 12 deletions

diff --git a/mail/mail-session.c b/mail/mail-session.c
index d86242d393..9009bb607b 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -171,7 +171,7 @@ get_password (CamelSession *session, CamelService *service, const char *domain,
 	char *ret = NULL;
 	EAccount *account = NULL;
 
-	url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL):NULL;
+	url = service ? camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL & (~CAMEL_URL_HIDE_AUTH)) : NULL;
 
 	if (!strcmp(item, "popb4smtp_uri")) {
 		/* not 100% mt safe, but should be ok */
@@ -286,20 +286,13 @@ struct _user_message_msg {
 
 static void user_message_exec (struct _user_message_msg *m);
 
-/* clicked, send back the reply */
 static void
-user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m)
+user_message_response_free (GtkDialog *dialog, int button, struct _user_message_msg *m)
 {
 	gtk_widget_destroy ((GtkWidget *) dialog);
 
 	user_message_dialog = NULL;
 
-	/* if !allow_cancel, then we've already replied */
-	if (m->allow_cancel) {
-		m->result = button == GTK_RESPONSE_OK;
-		e_flag_set (m->done);
-	}
-
 	/* check for pendings */
 	if (!g_queue_is_empty (&user_message_queue)) {
 		m = g_queue_pop_head (&user_message_queue);
@@ -308,6 +301,19 @@ user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *
 	}
 }
 
+/* clicked, send back the reply */
+static void
+user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m)
+{
+	/* if !allow_cancel, then we've already replied */
+	if (m->allow_cancel) {
+		m->result = button == GTK_RESPONSE_OK;
+		e_flag_set (m->done);
+	}
+
+	user_message_response_free (dialog, button, m);
+}
+
 static void
 user_message_exec (struct _user_message_msg *m)
 {
@@ -364,7 +370,7 @@ user_message_exec (struct _user_message_msg *m)
 	} else {
 		g_signal_connect (
 			user_message_dialog, "response",
-			G_CALLBACK (user_message_response), m);
+			G_CALLBACK (user_message_response_free), m);
 		g_object_set_data (
 			user_message_dialog, "response-handled",
 			GINT_TO_POINTER (TRUE));
@@ -375,8 +381,8 @@ user_message_exec (struct _user_message_msg *m)
 static void
 user_message_free (struct _user_message_msg *m)
 {
-	g_free(m->prompt);
-	e_flag_free(m->done);
+	g_free (m->prompt);
+	e_flag_free (m->done);
 }
 
 static MailMsgInfo user_message_info = {