talons

commit 6e2e1c8bcd096d117dc22dfd9989c5c922d64f8f
parent 94ec77b15d34079fa6752fcd1a6a687782b07f9c
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 30 Apr 2014 11:37:05 +0200

Check smtp auth if autoconfig works. This is probably required.

Diffstat:
M
src/gtk/gtkutils.c
 | 
6
++++++
M
src/gtk/gtkutils.h
 | 
1
+
M
src/prefs_account.c
 | 
1
+
M
src/wizard.c
 | 
1
+

4 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -1906,6 +1906,12 @@ static void auto_configure_done(const gchar *hostname, gint port, gboolean ssl, 
 			gtk_toggle_button_set_active(data->tls_checkbtn, TRUE);
 		}
 
+		/* Check authentication by default. This is probably required if
+		 * auto-configuration worked.
+		 */
+		if (data->auth_checkbtn)
+			gtk_toggle_button_set_active(data->auth_checkbtn, TRUE);
+
 		gtk_label_set_text(data->info_label, _("Done."));
 	} else {
 	gtk_label_set_text(data->info_label, _("Failed."));
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
@@ -222,6 +222,7 @@ typedef struct _AutoConfigureData {
 	gint default_ssl_port;
 	GtkToggleButton *tls_checkbtn;
 	GtkToggleButton *ssl_checkbtn;
+	GtkToggleButton *auth_checkbtn;
 	GtkLabel *info_label;
 	GtkButton *configure_button;
 	GtkButton *cancel_button;
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -3888,6 +3888,7 @@ static void auto_configure_cb (GtkWidget *widget, gpointer data)
 	send_data->ssl_checkbtn = NULL;
 	send_data->default_port = 25;
 	send_data->default_ssl_port = -1;
+	send_data->auth_checkbtn = send_page.smtp_auth_checkbtn;
 
 	auto_configure_service(send_data);
 
diff --git a/src/wizard.c b/src/wizard.c
@@ -1429,6 +1429,7 @@ static void auto_configure_cb (GtkWidget *widget, gpointer data)
 	send_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl);
 	send_data->default_port = 25;
 	send_data->default_ssl_port = -1;
+	send_data->auth_checkbtn = wizard->smtp_auth;
 
 	auto_configure_service(send_data);