Check smtp auth if autoconfig works. This is probably required.
authorColin Leroy <colin@colino.net>
Wed, 30 Apr 2014 09:37:05 +0000 (11:37 +0200)
committerColin Leroy <colin@colino.net>
Fri, 2 May 2014 07:20:39 +0000 (09:20 +0200)
src/gtk/gtkutils.c
src/gtk/gtkutils.h
src/prefs_account.c
src/wizard.c

index 9ec493c03f6668f327d5f887a60c39dc56f6a098..e2c0a71554ca6eb416e130899307c7640f8f3ecb 100644 (file)
@@ -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);
                }
 
                        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."));
                gtk_label_set_text(data->info_label, _("Done."));
        } else {
        gtk_label_set_text(data->info_label, _("Failed."));
index 43649a248581a1deb8ff66e99f3d9d6c6b9fa7e4..8c3849ff3d2e5451c3a8852b14fd1f226a8d7546 100644 (file)
@@ -222,6 +222,7 @@ typedef struct _AutoConfigureData {
        gint default_ssl_port;
        GtkToggleButton *tls_checkbtn;
        GtkToggleButton *ssl_checkbtn;
        gint default_ssl_port;
        GtkToggleButton *tls_checkbtn;
        GtkToggleButton *ssl_checkbtn;
+       GtkToggleButton *auth_checkbtn;
        GtkLabel *info_label;
        GtkButton *configure_button;
        GtkButton *cancel_button;
        GtkLabel *info_label;
        GtkButton *configure_button;
        GtkButton *cancel_button;
index 65c7d814aa43d6583e603ce3f20386ea052b4b49..d9d52bb316236fa99dcaee3c692a1eb9b4a78312 100644 (file)
@@ -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->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);
 
 
        auto_configure_service(send_data);
 
index 1c05f274e768d522c8406d0f691a1506e46ff70a..c17e13dd3e5043d322de0ddb3eb2436c8be370d8 100644 (file)
@@ -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->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);
 
 
        auto_configure_service(send_data);