diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-display.c | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5bbf4072b0..eb32df9718 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,13 @@ 2002-09-25 Dan Winship <danw@ximian.com> + * mail-display.c (mail_display_render): Add a margin around the + "flag for followup" table so it lines up with everything else. + Also, don't add "at your earliest convenience" after the flag if + there's no date set, since that doesn't make any sense for half of + the flags. ("For Your Information at your earliest convenience"). + +2002-09-25 Dan Winship <danw@ximian.com> + * component-factory.c (folder_types): add "mail/public". Leave "vtrash" as it is rather than renaming it to "mail/vtrash", because we want it to behave differently from normal mail folders diff --git a/mail/mail-display.c b/mail/mail-display.c index 80e9fa93c3..4865c11909 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -1750,14 +1750,17 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll) e_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due); } else { - snprintf (due_date, sizeof (due_date), "%s", _("at your earliest convenience")); + due_date[0] = '\0'; } gtk_html_stream_printf (stream, "<font color=\"#%s\">" - "<table cellspacing=1 cellpadding=1 bgcolor=\"#000000\"><tr><td>" - "<table cellspacing=0 bgcolor=\"#%s\" cellpadding=2 cellspacing=2>" + "<table width=\"100%%\" cellpadding=0 cellspacing=0><tr><td colspan=3 height=10></td></tr>" + "<tr><td width=10></td><td>" + "<table cellspacing=1 cellpadding=1 bgcolor=\"#000000\" width=\"100%%\"><tr><td>" + "<table cellspacing=0 bgcolor=\"#%s\" cellpadding=2 cellspacing=2 width=\"100%%\">" "<tr><td align=\"left\" width=20><img src=\"%s\" align=\"middle\"></td>" - "<td>%s%s%s%s %s</td></table></td></tr></table></font>", fontcolor, bgcolor, + "<td>%s%s%s%s %s</td></table></td></tr></table>" + "</td><td width=10></td></tr></table></font>", fontcolor, bgcolor, mail_display_get_url_for_icon (md, EVOLUTION_IMAGES "/flag-for-followup-16.png"), overdue ? "<b>" : "", overdue, overdue ? "</b> " : "", flag, due_date); |