aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-format.c14
2 files changed, 17 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9e9b277754..646b32b171 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-26 Dan Winship <danw@ximian.com>
+
+ * mail-format.c (handle_text_plain_flowed): Use <font color=...>
+ to mark citations rather than italicizing them, which has never
+ looked very nice. Now this is more consistent with the non-flowed
+ case.
+
2001-04-26 Jon Trowbridge <trow@ximian.com>
* folder-browser-factory.c: Added "MessageSearch" verb.
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 927751ba99..036a36a84b 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -960,6 +960,7 @@ handle_text_plain_flowed (char *buf, MailDisplay *md)
char *text, *line, *eol, *p;
int prevquoting = 0, quoting, len;
gboolean br_pending = FALSE;
+ guint32 citation_color = mail_config_get_citation_color ();
mail_html_write (md->html, md->stream,
"\n<!-- text/plain, flowed -->\n<font size=\"-3\">&nbsp</font><br>\n<tt>\n");
@@ -974,8 +975,11 @@ handle_text_plain_flowed (char *buf, MailDisplay *md)
for (p = line; *p == '>'; p++)
quoting++;
if (quoting != prevquoting) {
- mail_html_write (md->html, md->stream, "%s\n",
- prevquoting == 0 ? "<i>\n" : "");
+ if (prevquoting == 0) {
+ mail_html_write (md->html, md->stream,
+ "<font color=\"#%06x\">",
+ citation_color);
+ }
while (quoting > prevquoting) {
mail_html_write (md->html, md->stream,
"<blockquote>");
@@ -986,8 +990,10 @@ handle_text_plain_flowed (char *buf, MailDisplay *md)
"</blockquote>");
prevquoting--;
}
- mail_html_write (md->html, md->stream, "%s\n",
- prevquoting == 0 ? "</i>\n" : "");
+ if (quoting == 0) {
+ mail_html_write (md->html, md->stream,
+ "</font>\n");
+ }
} else if (br_pending) {
mail_html_write (md->html, md->stream, "<br>\n");
br_pending = FALSE;