diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-account-editor.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5b0943376e..2549cb3841 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-01-17 Jeffrey Stedfast <fejj@ximian.com> + + * mail-account-editor.c (construct): Oops. "url && url->host" + doesn't do much without the '?' and ':' ;-) + 2001-01-17 Ettore Perazzoli <ettore@ximian.com> * mail-ops.c (set_x_mailer): New function. diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c index dc19646f75..a75ae27a64 100644 --- a/mail/mail-account-editor.c +++ b/mail/mail-account-editor.c @@ -664,12 +664,11 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) editor->source_passwd = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourcePasswd")); gtk_entry_set_text (editor->source_passwd, url && url->passwd ? url->passwd : ""); editor->source_path = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourcePath")); - gtk_entry_set_text (editor->source_path, url && url->path); + gtk_entry_set_text (editor->source_path, url && url->path ? url->path : ""); editor->save_passwd = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSavePasswd")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->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")); - /* Anna's dialog doesn't have SSL either... */ if (editor->source_ssl) 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")); @@ -691,7 +690,6 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) } editor->transport_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportAuth")); editor->transport_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportSSL")); - /* Anna's dialog doesn't have SSL... */ if (editor->transport_ssl) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_ssl), account->transport->use_ssl); transport_type_init (editor, url); |