[evolution/gnome-3-16] Bug 684556 - Remove the Face header from the forwarded message body

[Milan Crha <mcrha src gnome org>]

commit deb9cb3f6d331c6f1312c66fa4b1cedfd06ae22c
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jun 1 10:51:09 2015 +0200

    Bug 684556 - Remove the Face header from the forwarded message body

 em-format/e-mail-formatter-quote-headers.c |    8 +++++++-
 em-format/e-mail-part-headers.c            |    5 +++++
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c
index 6c3a7c0..68212d7 100644
--- a/em-format/e-mail-formatter-quote-headers.c
+++ b/em-format/e-mail-formatter-quote-headers.c
@@ -95,6 +95,7 @@ static const gchar *addrspec_hdrs[] = {
 
 static void
 emfqe_format_header (EMailFormatter *formatter,
+                    EMailFormatterContext *context,
                      GString *buffer,
                      EMailPart *part,
                      const gchar *header_name,
@@ -108,6 +109,11 @@ emfqe_format_header (EMailFormatter *formatter,
        gint is_html = FALSE;
        gint i;
 
+       /* Skip Face header in prints, which includes also message forward */
+       if (context->mode == E_MAIL_FORMATTER_MODE_PRINTING &&
+           g_ascii_strcasecmp (header_name, "Face") == 0)
+               return;
+
        flags = E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE;
 
        canon_name = g_alloca (strlen (header_name) + 1);
@@ -255,7 +261,7 @@ emqfe_headers_format (EMailFormatterExtension *extension,
 
        for (ii = 0; ii < length; ii++)
                emfqe_format_header (
-                       formatter, buffer, part,
+                       formatter, context, buffer, part,
                        default_headers[ii], charset);
 
        g_strfreev (default_headers);
diff --git a/em-format/e-mail-part-headers.c b/em-format/e-mail-part-headers.c
index 9ffa594..5c494cd 100644
--- a/em-format/e-mail-part-headers.c
+++ b/em-format/e-mail-part-headers.c
@@ -97,6 +97,11 @@ mail_part_headers_build_print_model (EMailPartHeaders *part)
                if (g_ascii_strncasecmp (header->name, "Subject", 7) == 0)
                        continue;
 
+               /* Also skip the 'Face' header, which includes only
+                  base64 encoded data anyway. */
+               if (g_ascii_strcasecmp (header->name, "Face") == 0)
+                       continue;
+
                /* Arrange default headers first and select them to be
                 * included in the final printout.  All other headers
                 * are excluded by default in the final printout. */