From b6a9c052076fc3444b0e4a8a042f326665db3a37 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 15 Mar 2001 20:26:54 +0000 Subject: We don't care about SSL, yea baby... (apply_changes): Don't care about 2001-03-15 Jeffrey Stedfast * mail-account-editor.c (apply_changes): We don't care about SSL, yea baby... (apply_changes): Don't care about SSL, no baby... (construct): Yea, I said we don't care 'bout SSL, baby (construct): That's exactly what I said, uh huh... (transport_auth_type_changed): Set the sensitivity of the user/passwd entries. (transport_type_changed): If the hostname hasn't been set yet, just use "localhost" as it doesn't really matter, since all we need is a valid URL object. * mail-config.c: We no longer need `use_ssl' for sources and transports. svn path=/trunk/; revision=8741 --- mail/ChangeLog | 16 +++++++++++++++ mail/mail-account-editor.c | 32 +++++++++++++++++++---------- mail/mail-account-editor.h | 2 -- mail/mail-config.c | 15 -------------- mail/mail-config.glade | 50 ++-------------------------------------------- mail/mail-config.h | 1 - 6 files changed, 39 insertions(+), 77 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 004a27670e..d3f971377a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,19 @@ +2001-03-15 Jeffrey Stedfast + + * mail-account-editor.c (apply_changes): We don't care about SSL, + yea baby... + (apply_changes): Don't care about SSL, no baby... + (construct): Yea, I said we don't care 'bout SSL, baby + (construct): That's exactly what I said, uh huh... + (transport_auth_type_changed): Set the sensitivity of the + user/passwd entries. + (transport_type_changed): If the hostname hasn't been set yet, + just use "localhost" as it doesn't really matter, since all we + need is a valid URL object. + + * mail-config.c: We no longer need `use_ssl' for sources and + transports. + 2001-03-15 Dan Winship * mail-display.c (mail_display_redisplay): Remove a stray diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c index 0f7b605435..757cb41ef3 100644 --- a/mail/mail-account-editor.c +++ b/mail/mail-account-editor.c @@ -201,9 +201,6 @@ apply_changes (MailAccountEditor *editor) account->source->auto_check = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->source_auto_check)); account->source->auto_check_time = gtk_spin_button_get_value_as_int (editor->source_auto_timeout); - if (editor->source_ssl) - account->source->use_ssl = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->source_ssl)); - /* set the new source url */ g_free (account->source->url); account->source->url = camel_url_to_string (source_url, FALSE); @@ -244,9 +241,6 @@ apply_changes (MailAccountEditor *editor) transport_url->host = host; transport_url->port = port; - if (editor->transport_ssl) - account->transport->use_ssl = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->transport_ssl)); - /* set the new transport url */ g_free (account->transport->url); account->transport->url = camel_url_to_string (transport_url, FALSE); @@ -408,10 +402,25 @@ transport_auth_type_changed (GtkWidget *widget, gpointer user_data) { MailAccountEditor *editor = user_data; CamelServiceAuthType *authtype; + GtkWidget *user, *passwd; + gboolean sensitive; authtype = gtk_object_get_data (GTK_OBJECT (widget), "authtype"); gtk_object_set_data (GTK_OBJECT (editor), "transport_authmech", authtype->authproto); + + if (authtype->need_password) + sensitive = TRUE; + else + sensitive = FALSE; + + user = glade_xml_get_widget (editor->gui, "lblTransportUser"); + passwd = glade_xml_get_widget (editor->gui, "lblTransportPasswd"); + gtk_widget_set_sensitive (user, sensitive); + gtk_widget_set_sensitive (passwd, sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_user), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_passwd), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_save_passwd), sensitive); } static void @@ -525,6 +534,7 @@ transport_type_changed (GtkWidget *widget, gpointer user_data) label = glade_xml_get_widget (editor->gui, "lblTransportAuth"); if (provider->url_flags & CAMEL_URL_ALLOW_AUTH) { CamelURL *url; + char *host; gtk_widget_set_sensitive (GTK_WIDGET (editor->transport_auth), TRUE); gtk_widget_set_sensitive (label, TRUE); @@ -532,7 +542,11 @@ transport_type_changed (GtkWidget *widget, gpointer user_data) /* regen the auth list */ url = g_new0 (CamelURL, 1); url->protocol = g_strdup (provider->protocol); - url->host = g_strdup (gtk_entry_get_text (editor->transport_host)); + host = gtk_entry_get_text (editor->transport_host); + if (host && *host) + url->host = g_strdup (host); + else + url->host = g_strdup ("localhost"); transport_auth_init (editor, url); camel_url_free (url); } else { @@ -804,8 +818,6 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) editor->source_save_passwd = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSourceSavePasswd")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_save_passwd), account->source->save_passwd); editor->source_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuSourceAuth")); - editor->source_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSourceSSL")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_ssl), account->source->use_ssl); editor->keep_on_server = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkKeepMailOnServer")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->keep_on_server), account->source->keep_on_server); editor->source_auto_timeout = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinAutoCheckTimeout")); @@ -844,8 +856,6 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) gtk_entry_set_text (editor->transport_passwd, url && url->passwd ? url->passwd : ""); editor->transport_save_passwd = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportSavePasswd")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_save_passwd), account->transport->save_passwd); - editor->transport_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportSSL")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_ssl), account->transport->use_ssl); if (GTK_IS_OPTION_MENU (editor->transport_type)) transport_type_init (editor, url); else diff --git a/mail/mail-account-editor.h b/mail/mail-account-editor.h index 5bbdaa64b0..b53991236a 100644 --- a/mail/mail-account-editor.h +++ b/mail/mail-account-editor.h @@ -62,7 +62,6 @@ struct _MailAccountEditor { GtkEntry *source_path; GtkCheckButton *source_save_passwd; GtkOptionMenu *source_auth; - GtkCheckButton *source_ssl; GtkCheckButton *keep_on_server; @@ -78,7 +77,6 @@ struct _MailAccountEditor { GtkEntry *transport_user; GtkEntry *transport_passwd; GtkCheckButton *transport_save_passwd; - GtkCheckButton *transport_ssl; const CamelProvider *transport; }; diff --git a/mail/mail-config.c b/mail/mail-config.c index 0d182cee02..33edd27ecc 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -104,7 +104,6 @@ service_copy (const MailConfigService *source) new->auto_check_time = source->auto_check_time; new->enabled = source->enabled; new->save_passwd = source->save_passwd; - new->use_ssl = source->use_ssl; return new; } @@ -283,9 +282,6 @@ config_read (void) path = g_strdup_printf ("source_save_passwd_%d", i); source->save_passwd = gnome_config_get_bool (path); g_free (path); - path = g_strdup_printf ("source_use_ssl_%d", i); - source->use_ssl = gnome_config_get_bool (path); - g_free (path); /* get the transport */ transport = g_new0 (MailConfigService, 1); @@ -303,10 +299,6 @@ config_read (void) transport->url = NULL; } - path = g_strdup_printf ("transport_use_ssl_%d", i); - transport->use_ssl = gnome_config_get_bool (path); - g_free (path); - account->id = id; account->source = source; account->transport = transport; @@ -452,9 +444,6 @@ mail_config_write (void) path = g_strdup_printf ("source_save_passwd_%d", i); gnome_config_set_bool (path, account->source->save_passwd); g_free (path); - path = g_strdup_printf ("source_use_ssl_%d", i); - gnome_config_set_bool (path, account->source->use_ssl); - g_free (path); /* transport info */ path = g_strdup_printf ("transport_url_%d", i); @@ -464,10 +453,6 @@ mail_config_write (void) path = g_strdup_printf ("transport_save_passwd_%d", i); gnome_config_set_bool (path, account->transport->save_passwd); g_free (path); - - path = g_strdup_printf ("transport_use_ssl_%d", i); - gnome_config_set_bool (path, account->transport->use_ssl); - g_free (path); } gnome_config_pop_prefix (); diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 5f5d6d0540..4a902dd31e 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2588,7 +2588,7 @@ Click "Finish" to save your settings. GtkTable tableSource 4 - 8 + 7 2 False 4 @@ -2793,29 +2793,6 @@ Click "Finish" to save your settings. - - GtkCheckButton - chkSourceSSL - True - - False - True - - 0 - 2 - 7 - 8 - 0 - 0 - False - False - False - False - True - False - - - GtkLabel lblSourcePath @@ -2962,7 +2939,7 @@ DIGEST-MD5 GtkTable tableTransport 4 - 7 + 6 2 False 4 @@ -3218,29 +3195,6 @@ CRAM-MD5 - - GtkCheckButton - chkTransportSSL - True - - False - True - - 0 - 2 - 6 - 7 - 0 - 0 - False - False - False - False - True - False - - - GtkCheckButton chkTransportSavePasswd diff --git a/mail/mail-config.h b/mail/mail-config.h index 852049ccc0..3f1207bd79 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -47,7 +47,6 @@ typedef struct { gboolean enabled; gboolean save_passwd; - gboolean use_ssl; } MailConfigService; typedef struct { -- cgit v1.2.3