aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-format.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c1f80534a3..78a3e462cf 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-19 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-format.c (mail_generate_reply): If the name is empty
+ string, use the address.
+
2001-01-19 Dan Winship <danw@ximian.com>
* mail-display.c (pixmap_press): Update for e_popup_menu_run
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 136afb8419..6e110fb806 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1656,11 +1656,12 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all)
if (!composer)
return NULL;
+ /* FIXME: should probably use a shorter date string */
sender = camel_mime_message_get_from (message);
camel_internet_address_get (sender, 0, &name, &address);
date = camel_mime_message_get_date (message, &offset);
date_str = header_format_date (date, offset);
- text = mail_tool_quote_message (message, _("On %s, %s wrote:\n"), date_str, name ? name : address);
+ text = mail_tool_quote_message (message, _("On %s, %s wrote:\n"), date_str, name && *name ? name : address);
g_free (date_str);
if (text) {