aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-10-05 04:28:08 +0800
committerDan Winship <danw@src.gnome.org>2001-10-05 04:28:08 +0800
commit447e2e189e014678bd8af495a3fc6ca5d70297ca (patch)
tree9851ee93462621bc93fc8d87d0b1c7ecdbfb5f93
parent840bb7f136f27d2292be4890d6fb113604d2257b (diff)
downloadgsoc2013-evolution-447e2e189e014678bd8af495a3fc6ca5d70297ca.tar
gsoc2013-evolution-447e2e189e014678bd8af495a3fc6ca5d70297ca.tar.gz
gsoc2013-evolution-447e2e189e014678bd8af495a3fc6ca5d70297ca.tar.bz2
gsoc2013-evolution-447e2e189e014678bd8af495a3fc6ca5d70297ca.tar.lz
gsoc2013-evolution-447e2e189e014678bd8af495a3fc6ca5d70297ca.tar.xz
gsoc2013-evolution-447e2e189e014678bd8af495a3fc6ca5d70297ca.tar.zst
gsoc2013-evolution-447e2e189e014678bd8af495a3fc6ca5d70297ca.zip
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 "<foo@bar.com>". svn path=/trunk/; revision=13423
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-format.c15
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 <danw@ximian.com>
+
+ * mail-format.c (write_address): Fix so that an email address with
+ no name is once again just "foo@bar.com", not "<foo@bar.com>".
+
2001-10-04 Iain Holmes <iain@ximian.com>
* 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 &lt;<a href=\"mailto:%s\">%s</a>&gt;",
- have_name ? name_disp : "",
- addr_url,
- email_disp);
-
+ if (have_name) {
+ mail_html_write (md->html, md->stream,
+ "%s &lt;<a href=\"mailto:%s\">%s</a>&gt;",
+ name_disp, addr_url, email_disp);
+ } else {
+ mail_html_write (md->html, md->stream,
+ "<a href=\"mailto:%s\">%s</a>",
+ addr_url, email_disp);
+ }
} else {
char *str;