diff options
| author | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2007-08-01 04:08:58 +0800 |
|---|---|---|
| committer | Veerapuram Varadhan <vvaradan@src.gnome.org> | 2007-08-01 04:08:58 +0800 |
| commit | c8315276d496d50dbf077eb9bc3da2e6aabee50a (patch) | |
| tree | 72902f139e893a119981184d15aca6ee59e52762 | |
| parent | 39e65cba8e50b45d2dc9defdba94451b36bfb19b (diff) | |
| download | gsoc2013-evolution-c8315276d496d50dbf077eb9bc3da2e6aabee50a.tar.gz gsoc2013-evolution-c8315276d496d50dbf077eb9bc3da2e6aabee50a.tar.zst gsoc2013-evolution-c8315276d496d50dbf077eb9bc3da2e6aabee50a.zip | |
Do not show "on-behalf-of" band for all messages, instead check for
* Do not show "on-behalf-of" band for all messages, instead check for
* X-Evolution-Mail-From-Delegate header.
svn path=/trunk/; revision=33916
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-format-html.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 540dd13bf3..445e93f3d8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-07-31 Veerapuram Varadhan <vvaradhan@novell.com> + + * em-format-html.c (efh_format_headers): Do not show the + pretty-"on-behalf-of"-band for all messages that has Sender header + set, instead rely on the custom X-Evolution-Mail-From-Delegate + flag that will be added by each providers. + 2007-07-30 Chenthill Palanisamy <pchenthill@novell.com> * em-format-html.c: (efh_format_headers): Marked diff --git a/mail/em-format-html.c b/mail/em-format-html.c index e999e54953..2fbe9932c2 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1777,6 +1777,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) char *face_header_value = NULL; int face_header_len = 0; char *header_sender = NULL, *header_from = NULL, *name; + gboolean mail_from_delegate = FALSE; ct = camel_mime_part_get_content_type((CamelMimePart *)part); charset = camel_content_type_param (ct, "charset"); @@ -1787,7 +1788,6 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) "<font color=\"#%06x\">\n" "<table cellpadding=\"0\" width=\"100%%\">", efh->text_colour & 0xffffff); - header = ((CamelMimePart *)part)->headers; while (header) { @@ -1824,8 +1824,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) g_string_free(html, FALSE); g_free(name); } + + if (!g_ascii_strcasecmp (header->name, "X-Evolution-Mail-From-Delegate")) + mail_from_delegate = TRUE; - if (header_sender && header_from) { + if (header_sender && header_from && mail_from_delegate) { camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>"); camel_stream_printf(stream, "<td align=\"left\" width=\"100%%\">"); /* To translators: This message suggests to the receipients that the sender of the mail is |