[evolution/wip/webkit2] Finish one leftover (of 2) from the EAttachmentBar changes

[Milan Crha <mcrha src gnome org>]

commit a286633a20349d224d90d6a3a56a3b3af2223c64
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 2 11:35:01 2016 +0200

    Finish one leftover (of 2) from the EAttachmentBar changes

 em-format/Makefile.am                             |    1 -
 em-format/e-mail-formatter-attachment.c           |    8 +-
 em-format/e-mail-formatter-message-rfc822.c       |    4 -
 em-format/e-mail-formatter-quote-attachment.c     |  127 ---------------------
 em-format/e-mail-formatter-quote-message-rfc822.c |    4 -
 em-format/e-mail-formatter-quote.c                |    2 -
 em-format/e-mail-formatter.c                      |    5 +-
 em-format/e-mail-parser.c                         |    2 +-
 em-format/e-mail-part-attachment.c                |    2 +-
 em-format/e-mail-part-attachment.h                |    2 +-
 10 files changed, 9 insertions(+), 148 deletions(-)
---
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index ca80983..3f2c438 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -82,7 +82,6 @@ libevolution_mail_formatter_la_SOURCES =              \
        e-mail-formatter-text-html.c                    \
        e-mail-formatter-text-plain.c                   \
        e-mail-formatter-print-headers.c                \
-       e-mail-formatter-quote-attachment.c             \
        e-mail-formatter-quote-headers.c                \
        e-mail-formatter-quote-message-rfc822.c         \
        e-mail-formatter-quote-text-enriched.c          \
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index 01109cd..6064b58 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -189,8 +189,8 @@ emfe_attachment_format (EMailFormatterExtension *extension,
        g_free (text);
        g_object_unref (mime_part);
 
-       if (empa->attachment_view_part_id)
-               attachment_part_id = empa->attachment_view_part_id;
+       if (empa->part_id_with_attachment)
+               attachment_part_id = empa->part_id_with_attachment;
        else
                attachment_part_id = part_id;
 
@@ -206,12 +206,12 @@ emfe_attachment_format (EMailFormatterExtension *extension,
 
                content_stream = g_memory_output_stream_new_resizable ();
 
-               if (empa->attachment_view_part_id != NULL) {
+               if (empa->part_id_with_attachment != NULL) {
                        EMailPart *attachment_view_part;
 
                        attachment_view_part = e_mail_part_list_ref_part (
                                context->part_list,
-                               empa->attachment_view_part_id);
+                               empa->part_id_with_attachment);
 
                        /* Avoid recursion. */
                        if (attachment_view_part == part)
diff --git a/em-format/e-mail-formatter-message-rfc822.c b/em-format/e-mail-formatter-message-rfc822.c
index 8884cbc..7f8d6ef 100644
--- a/em-format/e-mail-formatter-message-rfc822.c
+++ b/em-format/e-mail-formatter-message-rfc822.c
@@ -157,10 +157,6 @@ emfe_message_rfc822_format (EMailFormatterExtension *extension,
                        EMailPart *p = link->data;
                        const gchar *p_id;
 
-                       /* Skip attachment bar */
-                       if (e_mail_part_id_has_suffix (part, ".attachment-bar"))
-                               continue;
-
                        p_id = e_mail_part_get_id (p);
 
                        /* Check for nested rfc822 messages */
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c 
b/em-format/e-mail-formatter-quote-message-rfc822.c
index 180a283..7ed0bd4 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -89,10 +89,6 @@ emfqe_message_rfc822_format (EMailFormatterExtension *extension,
 
                p_id = e_mail_part_get_id (p);
 
-               /* Skip attachment bar */
-               if (e_mail_part_id_has_suffix (p, ".attachment-bar"))
-                       continue;
-
                if (e_mail_part_id_has_suffix (p, ".headers.")) {
                        if (qc->qf_flags & E_MAIL_FORMATTER_QUOTE_FLAG_HEADERS) {
                                e_mail_formatter_format_as (
diff --git a/em-format/e-mail-formatter-quote.c b/em-format/e-mail-formatter-quote.c
index adbe223..24abcbb 100644
--- a/em-format/e-mail-formatter-quote.c
+++ b/em-format/e-mail-formatter-quote.c
@@ -38,7 +38,6 @@ struct _EMailFormatterQuotePrivate {
 };
 
 /* internal formatter extensions */
-GType e_mail_formatter_quote_attachment_get_type (void);
 GType e_mail_formatter_quote_headers_get_type (void);
 GType e_mail_formatter_quote_message_rfc822_get_type (void);
 GType e_mail_formatter_quote_text_enriched_get_type (void);
@@ -161,7 +160,6 @@ static void
 e_mail_formatter_quote_base_init (EMailFormatterQuoteClass *class)
 {
        /* Register internal extensions. */
-       g_type_ensure (e_mail_formatter_quote_attachment_get_type ());
        g_type_ensure (e_mail_formatter_quote_headers_get_type ());
        g_type_ensure (e_mail_formatter_quote_message_rfc822_get_type ());
        g_type_ensure (e_mail_formatter_quote_text_enriched_get_type ());
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 559872f..13e68c5 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -34,7 +34,7 @@
 
 #define E_MAIL_FORMATTER_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_MAIL_FORMATTER, EMailFormatterPrivate))\
+       ((obj), E_TYPE_MAIL_FORMATTER, EMailFormatterPrivate))
 
 #define STYLESHEET_URI \
        "evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css"
@@ -451,8 +451,7 @@ mail_formatter_run (EMailFormatter *formatter,
 
                if (!ok) {
                        /* We don't want to source these */
-                       if (e_mail_part_id_has_suffix (part, ".headers") ||
-                           e_mail_part_id_has_suffix (part, "attachment-bar"))
+                       if (e_mail_part_id_has_suffix (part, ".headers"))
                                continue;
 
                        e_mail_formatter_format_as (
diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c
index c45291a..02d303e 100644
--- a/em-format/e-mail-parser.c
+++ b/em-format/e-mail-parser.c
@@ -712,7 +712,7 @@ e_mail_parser_wrap_as_attachment (EMailParser *parser,
        first_part = g_queue_peek_head (parts_queue);
        if (first_part != NULL) {
                const gchar *id = e_mail_part_get_id (first_part);
-               empa->attachment_view_part_id = g_strdup (id);
+               empa->part_id_with_attachment = g_strdup (id);
                first_part->is_hidden = TRUE;
        }
 
diff --git a/em-format/e-mail-part-attachment.c b/em-format/e-mail-part-attachment.c
index e12e555..3490c3d 100644
--- a/em-format/e-mail-part-attachment.c
+++ b/em-format/e-mail-part-attachment.c
@@ -98,7 +98,7 @@ mail_part_attachment_finalize (GObject *object)
 {
        EMailPartAttachment *part = E_MAIL_PART_ATTACHMENT (object);
 
-       g_free (part->attachment_view_part_id);
+       g_free (part->part_id_with_attachment);
 
        /* Chain up to parent's finalize() method. */
        G_OBJECT_CLASS (e_mail_part_attachment_parent_class)->
diff --git a/em-format/e-mail-part-attachment.h b/em-format/e-mail-part-attachment.h
index 0bfeb7e..818ab30 100644
--- a/em-format/e-mail-part-attachment.h
+++ b/em-format/e-mail-part-attachment.h
@@ -52,7 +52,7 @@ struct _EMailPartAttachment {
        EMailPart parent;
        EMailPartAttachmentPrivate *priv;
 
-       gchar *attachment_view_part_id; /* FIXME WK2: maybe drop this property */
+       gchar *part_id_with_attachment;
 
        gboolean shown;
        const gchar *snoop_mime_type;