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-accounts.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'mail/mail-accounts.c') diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index a5baecdc2f..965454da8b 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -105,11 +105,17 @@ load_accounts (MailAccountsDialog *dialog) account = node->data; - url = camel_url_new (account->source->url, NULL); + if (account->source->url) + url = camel_url_new (account->source->url, NULL); + else + url = NULL; + text[0] = g_strdup (account->name); - text[1] = g_strdup_printf ("%s%s", url->protocol, - account->default_account ? " (default)" : ""); - camel_url_free (url); + text[1] = g_strdup_printf ("%s%s", url && url->protocol ? url->protocol : _("None"), + account->default_account ? _(" (default)") : ""); + + if (url) + camel_url_free (url); gtk_clist_append (dialog->mail_accounts, text); g_free (text[0]); -- cgit v1.2.3