From 65c33efb1b50b4ca08adf3dbc56c300a20b55608 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 23 Oct 2001 23:39:07 +0000 Subject: Don't allow an auth-type to be set when saving the service. 2001-10-23 Jeffrey Stedfast * mail-account-gui.c (service_check_supported): Don't allow an auth-type to be set when saving the service. (mail_account_gui_new): Initialize the source and transport provider_type's here so we don't forget to do it when it matters. (mail_account_gui_setup): Don't bother setting the provider_type's here, they are already set in mail_account_gui_new() now. svn path=/trunk/; revision=13968 --- mail/mail-account-gui.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'mail/mail-account-gui.c') diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 39572f9ab1..07b76a93b9 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -502,10 +502,20 @@ service_check_supported (GtkButton *button, gpointer user_data) MailAccountGuiService *gsvc = user_data; MailConfigService *service; GList *authtypes = NULL; + GtkWidget *authitem; service = g_new0 (MailConfigService, 1); + + /* This is sort of a hack, when checking for supported AUTH + types we don't want to use whatever authtype is selected + because it may not be available. */ + authitem = gsvc->authitem; + gsvc->authitem = NULL; + save_service (gsvc, NULL, service); + gsvc->authitem = authitem; + if (mail_config_check_service (service->url, gsvc->provider_type, &authtypes)) { build_auth_menu (gsvc, gsvc->provider->authtypes, authtypes, TRUE); if (!authtypes) { @@ -1244,6 +1254,7 @@ mail_account_gui_new (MailConfigAccount *account) } /* Source */ + gui->source.provider_type = CAMEL_PROVIDER_STORE; gui->source.type = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "source_type_omenu")); gui->source.description = GTK_LABEL (glade_xml_get_widget (gui->xml, "source_description")); gui->source.hostname = GTK_ENTRY (glade_xml_get_widget (gui->xml, "source_host")); @@ -1266,6 +1277,7 @@ mail_account_gui_new (MailConfigAccount *account) gui->source_auto_check_min = GTK_SPIN_BUTTON (glade_xml_get_widget (gui->xml, "extra_auto_check_min")); /* Transport */ + gui->transport.provider_type = CAMEL_PROVIDER_TRANSPORT; gui->transport.type = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "transport_type_omenu")); gui->transport.description = GTK_LABEL (glade_xml_get_widget (gui->xml, "transport_description")); gui->transport.hostname = GTK_ENTRY (glade_xml_get_widget (gui->xml, "transport_host")); -- cgit v1.2.3