diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2001-02-06 05:06:54 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-02-06 05:06:54 +0800 |
commit | f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb (patch) | |
tree | c1a59eae770ec72dda8266ceda944ea2f1a6f0d9 /mail/mail-config-druid.c | |
parent | f7926820edcccd0d5fdab952909793e5752253ef (diff) | |
download | gsoc2013-evolution-f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb.tar gsoc2013-evolution-f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb.tar.gz gsoc2013-evolution-f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb.tar.bz2 gsoc2013-evolution-f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb.tar.lz gsoc2013-evolution-f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb.tar.xz gsoc2013-evolution-f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb.tar.zst gsoc2013-evolution-f5ab7142647eaee7b701bc49bc8ce1ba0f3455fb.zip |
Keep track of the CheckSettings check boxes. (transport_next): Connect if
2001-02-05 Jeffrey Stedfast <fejj@ximian.com>
* mail-config-druid.c (construct): Keep track of the CheckSettings
check boxes.
(transport_next): Connect if the user says so.
(incoming_next): Same. Also, don't jump to the next page if
test-settings fails.
svn path=/trunk/; revision=7984
Diffstat (limited to 'mail/mail-config-druid.c')
-rw-r--r-- | mail/mail-config-druid.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index 5547f8791a..4e164cccbc 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -333,6 +333,7 @@ incoming_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data) GtkWidget *transport_page; GList *authtypes = NULL; gchar *source_url; + gboolean connect; CamelURL *url; config->have_auth_page = TRUE; @@ -353,8 +354,10 @@ incoming_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data) url = camel_url_new (source_url, NULL); g_free (source_url); + connect = GTK_TOGGLE_BUTTON (config->incoming_check_settings)->active; + /* If we can't connect, warn them and continue on to the Transport page. */ - if (!mail_config_check_service (url, CAMEL_PROVIDER_STORE, FALSE, &authtypes)) { + if (!mail_config_check_service (url, CAMEL_PROVIDER_STORE, connect, &authtypes)) { GtkWidget *dialog; char *source, *warning; @@ -370,11 +373,6 @@ incoming_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data) gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); - /* Skip to transport page. */ - config->have_auth_page = FALSE; - transport_page = glade_xml_get_widget (config->gui, "druidTransportPage"); - gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (transport_page)); - return TRUE; } camel_url_free (url); @@ -627,6 +625,7 @@ static gboolean transport_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data) { MailConfigDruid *config = data; + gboolean connect; gchar *xport_url; CamelURL *url; @@ -634,8 +633,10 @@ transport_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data) url = camel_url_new (xport_url, NULL); g_free (xport_url); + connect = GTK_TOGGLE_BUTTON (config->outgoing_check_settings)->active; + /* If we can't connect, don't let them continue. */ - if (!mail_config_check_service (url, CAMEL_PROVIDER_TRANSPORT, FALSE, NULL)) { + if (!mail_config_check_service (url, CAMEL_PROVIDER_TRANSPORT, connect, NULL)) { GtkWidget *dialog; char *transport, *warning; @@ -1045,6 +1046,7 @@ construct (MailConfigDruid *druid) druid->incoming_path = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingPath")); gtk_signal_connect (GTK_OBJECT (druid->incoming_path), "changed", incoming_changed, druid); druid->incoming_keep_mail = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkIncomingKeepMail")); + druid->incoming_check_settings = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkIncomingCheckSettings")); druid->have_auth_page = TRUE; druid->auth_text = glade_xml_get_widget (gui, "htmlAuthentication"); @@ -1059,6 +1061,7 @@ construct (MailConfigDruid *druid) druid->outgoing_hostname = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportHostname")); gtk_signal_connect (GTK_OBJECT (druid->outgoing_hostname), "changed", transport_changed, druid); druid->outgoing_requires_auth = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportNeedsAuth")); + druid->outgoing_check_settings = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkOutgoingCheckSettings")); set_defaults (druid); |