From 6e087969220063436a3b166bda6efcaceda525eb Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 2 Apr 2001 21:00:42 +0000 Subject: Add a "provider_type" arg to MailAccountGuiService. * mail-account-gui.c: Add a "provider_type" arg to MailAccountGuiService. (transport_needs_auth_toggled): Call service_changed if enabling the auth pane so the status of the "Check supported types" button will be correct. (service_check_supported): Use gsvc->provider_type, not CAMEL_PROVIDER_STORE. (mail_account_gui_new): Pass the transport as the user_data to the "changed" signal on transport.hostname, not the store. (mail_account_gui_setup): Set up provider_type fields svn path=/trunk/; revision=9101 --- mail/ChangeLog | 13 +++++++++++++ mail/mail-account-gui.c | 8 ++++++-- mail/mail-account-gui.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index c914b2dd80..183887dfea 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,16 @@ +2001-04-02 Dan Winship + + * mail-account-gui.c: Add a "provider_type" arg to + MailAccountGuiService. + (transport_needs_auth_toggled): Call service_changed if enabling + the auth pane so the status of the "Check supported types" button + will be correct. + (service_check_supported): Use gsvc->provider_type, not + CAMEL_PROVIDER_STORE. + (mail_account_gui_new): Pass the transport as the user_data to the + "changed" signal on transport.hostname, not the store. + (mail_account_gui_setup): Set up provider_type fields + 2001-04-01 Gediminas Paulauskas * component-factory.c: changed vtrash icon to trash. doh diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index aa9fe6c2aa..cca9bc1ffb 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -282,6 +282,8 @@ transport_needs_auth_toggled (GtkToggleButton *toggle, gpointer data) widget = glade_xml_get_widget (gui->xml, "transport_auth_frame"); gtk_widget_set_sensitive (widget, need); + if (need) + service_changed (NULL, &gui->transport); } static void @@ -367,7 +369,7 @@ service_check_supported (GtkButton *button, gpointer user_data) service = g_new0 (MailConfigService, 1); save_service (gsvc, NULL, service); - if (mail_config_check_service (service->url, CAMEL_PROVIDER_STORE, &authtypes)) { + if (mail_config_check_service (service->url, gsvc->provider_type, &authtypes)) { build_auth_menu (gsvc, authtypes); g_list_free (authtypes); } @@ -815,7 +817,7 @@ mail_account_gui_new (MailConfigAccount *account) gui->transport.type = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "transport_type_omenu")); gui->transport.hostname = GTK_ENTRY (glade_xml_get_widget (gui->xml, "transport_host")); gtk_signal_connect (GTK_OBJECT (gui->transport.hostname), "changed", - GTK_SIGNAL_FUNC (service_changed), &gui->source); + GTK_SIGNAL_FUNC (service_changed), &gui->transport); gui->transport.username = GTK_ENTRY (glade_xml_get_widget (gui->xml, "transport_user")); gtk_signal_connect (GTK_OBJECT (gui->transport.username), "changed", GTK_SIGNAL_FUNC (service_changed), &gui->source); @@ -1032,6 +1034,7 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top) if (source_proto) { setup_service (&gui->source, gui->account->source); + gui->source.provider_type = CAMEL_PROVIDER_STORE; g_free (source_proto); if (gui->account->source->auto_check) { gtk_toggle_button_set_active (gui->source_auto_check, TRUE); @@ -1042,6 +1045,7 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top) if (transport_proto) { if (setup_service (&gui->transport, gui->account->transport)) gtk_toggle_button_set_active (gui->transport_needs_auth, TRUE); + gui->transport.provider_type = CAMEL_PROVIDER_TRANSPORT; g_free (transport_proto); } } diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h index 9950157ece..159743e475 100644 --- a/mail/mail-account-gui.h +++ b/mail/mail-account-gui.h @@ -49,6 +49,7 @@ typedef struct { GtkButton *check_supported; CamelProvider *provider; + CamelProviderType provider_type; } MailAccountGuiService; typedef struct { -- cgit v1.2.3