From 447e2e189e014678bd8af495a3fc6ca5d70297ca Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 4 Oct 2001 20:28:08 +0000 Subject: Fix so that an email address with no name is once again just * mail-format.c (write_address): Fix so that an email address with no name is once again just "foo@bar.com", not "". svn path=/trunk/; revision=13423 --- mail/ChangeLog | 5 +++++ mail/mail-format.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 5799fa160a..d907c82976 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-10-04 Dan Winship + + * mail-format.c (write_address): Fix so that an email address with + no name is once again just "foo@bar.com", not "". + 2001-10-04 Iain Holmes * importers/evolution-mbox-importer.c (load_file_fn): Only pass diff --git a/mail/mail-format.c b/mail/mail-format.c index 6ed7aafdc8..5cfaa4f63a 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -850,12 +850,15 @@ write_address (MailDisplay *md, const CamelInternetAddress *addr, const char *fi email_disp = g_strdup ("???"); } - mail_html_write (md->html, md->stream, - "%s <%s>", - have_name ? name_disp : "", - addr_url, - email_disp); - + if (have_name) { + mail_html_write (md->html, md->stream, + "%s <%s>", + name_disp, addr_url, email_disp); + } else { + mail_html_write (md->html, md->stream, + "%s", + addr_url, email_disp); + } } else { char *str; -- cgit v1.2.3