From 99a779567bde67b8994af25d13bfd6f6e48fea04 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 17 Jan 2001 20:11:36 +0000 Subject: Handle NULL source and, while we're at it, transport URLs. Apparently 2001-01-17 Jeffrey Stedfast * mail-account-editor.c (construct): Handle NULL source and, while we're at it, transport URLs. Apparently camel_url_new() and/or camel-url_free() don't handle NULL input well. * mail-accounts.c (load_accounts): Handle NULL source URLs. svn path=/trunk/; revision=7595 --- mail/mail-account-editor.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'mail/mail-account-editor.c') diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c index a75ae27a64..5a08db93a8 100644 --- a/mail/mail-account-editor.c +++ b/mail/mail-account-editor.c @@ -645,7 +645,11 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) gtk_entry_set_text (GTK_ENTRY (entry), account->id->signature); /* Servers */ - url = camel_url_new (account->source->url, NULL); + if (account->source->url) + url = camel_url_new (account->source->url, NULL); + else + url = NULL; + editor->source_type = glade_xml_get_widget (gui, "txtSourceType"); if (GTK_IS_LABEL (editor->source_type)) gtk_label_set_text (GTK_LABEL (editor->source_type), url ? url->protocol : _("None")); @@ -675,10 +679,15 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->keep_on_server), account->source->keep_on_server); source_check (editor, url); source_auth_init (editor, url); - camel_url_free (url); + if (url) + camel_url_free (url); /* Transport */ - url = camel_url_new (account->transport->url, NULL); + if (account->transport->url) + url = camel_url_new (account->transport->url, NULL); + else + url = NULL; + editor->transport_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportType")); editor->transport_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportHost")); gtk_entry_set_text (editor->transport_host, url && url->host ? url->host : ""); @@ -693,7 +702,8 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) if (editor->transport_ssl) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_ssl), account->transport->use_ssl); transport_type_init (editor, url); - camel_url_free (url); + if (url) + camel_url_free (url); editor->account = account; } -- cgit v1.2.3