diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-format-html.c | 2 | ||||
| -rw-r--r-- | mail/em-format-quote.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 7df0f1fdac..8a4cb3beed 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2004-08-10 Jeffrey Stedfast <fejj@novell.com> + + Partial fix for bug #62771 + + * em-format-quote.c (emfq_format_header): Same. + + * em-format-html.c (efh_format_header): Decode the + X-Mailer/User-Agent headers. + 2004-08-10 Not Zed <NotZed@Ximian.com> * mail-session.c (get_password): just call diff --git a/mail/em-format-html.c b/mail/em-format-html.c index d84238fda0..60baac02d5 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1552,7 +1552,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct } else if (!strcmp(name, "x-evolution-mailer")) { /* pseudo-header */ label = _("Mailer"); - txt = header->value; + txt = value = camel_header_format_ctext (header->value, charset); flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "date") || !strcmp(name, "resent-date")) { int msg_offset, local_tz; diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 16d6bbc4e6..59f75181f9 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -309,6 +309,8 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const if (!(txt = camel_medium_get_header (part, "user-agent"))) return; + txt = value = camel_header_format_ctext (txt, charset); + label = _("Mailer"); flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp (name, "date") || !strcmp (name, "resent-date")) { |