diff options
| author | Sankarasivasubramanian Pasupathilingam <psankar@src.gnome.org> | 2008-09-15 16:21:02 +0800 |
|---|---|---|
| committer | Sankarasivasubramanian Pasupathilingam <psankar@src.gnome.org> | 2008-09-15 16:21:02 +0800 |
| commit | 29b798bae34359dcad118be45729509dcd69747a (patch) | |
| tree | 0bd4a8f352d1603cc5bb5b65248195235beb8ca4 /mail/em-format-html.c | |
| parent | d28925fa5d9e5060a5dd1e95a27feb808da9b71b (diff) | |
| download | gsoc2013-evolution-29b798bae34359dcad118be45729509dcd69747a.tar gsoc2013-evolution-29b798bae34359dcad118be45729509dcd69747a.tar.gz gsoc2013-evolution-29b798bae34359dcad118be45729509dcd69747a.tar.bz2 gsoc2013-evolution-29b798bae34359dcad118be45729509dcd69747a.tar.lz gsoc2013-evolution-29b798bae34359dcad118be45729509dcd69747a.tar.xz gsoc2013-evolution-29b798bae34359dcad118be45729509dcd69747a.tar.zst gsoc2013-evolution-29b798bae34359dcad118be45729509dcd69747a.zip | |
** Fix for bug #539536
* em-format.c: (struct default_headers):
* em-format-html.c: (efh_format_headers):
* em-format-html.c: (default_headers):
Add "Face" header to default headers and allow it to be hidden.
svn path=/trunk/; revision=36331
Diffstat (limited to 'mail/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 99c670e5ae..fa185bf9df 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1931,10 +1931,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) } else { int mailer_shown = FALSE; while (h->next) { - int mailer; + int mailer, face; header = ((CamelMimePart *)part)->headers; mailer = !g_ascii_strcasecmp (h->name, "X-Evolution-Mailer"); + face = !g_ascii_strcasecmp (h->name, "Face"); while (header) { if (emf->show_photo && !photo_name && !g_ascii_strcasecmp (header->name, "From")) @@ -1967,7 +1968,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) efh_format_header (emf, stream, part, &xmailer, h->flags, charset); if (strstr(use_header->value, "Evolution")) have_icon = TRUE; - } else if (!g_ascii_strcasecmp (header->name, "Face") && !face_decoded) { + } else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) { char *cp = header->value; /* Skip over spaces */ @@ -1978,7 +1979,8 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) face_header_value = g_realloc (face_header_value, face_header_len + 1); face_header_value[face_header_len] = 0; face_decoded = TRUE; - } else if (!g_ascii_strcasecmp (header->name, h->name)) { + /* Showing an encoded "Face" header makes little sense */ + } else if (!g_ascii_strcasecmp (header->name, h->name) && !face) { efh_format_header(emf, stream, part, header, h->flags, charset); } |