[evolution/wip/webkit2] EHTMLEditorView - Some of the Evolution's composer attributes are sent in HTML messages

[Milan Crha <mcrha src gnome org>]

commit 328960daf3108f446636c6cd85ffe411773317b7
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Mar 3 15:18:07 2016 +0100

    EHTMLEditorView - Some of the Evolution's composer attributes are sent in HTML messages

 .../composer/e-html-editor-view-dom-functions.c    |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/web-extensions/composer/e-html-editor-view-dom-functions.c 
b/web-extensions/composer/e-html-editor-view-dom-functions.c
index 685e18e..bbadb43 100644
--- a/web-extensions/composer/e-html-editor-view-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-view-dom-functions.c
@@ -1826,12 +1826,11 @@ dom_set_links_active (WebKitDOMDocument *document,
 {
        WebKitDOMElement *style;
 
-       if (active) {
-               style = webkit_dom_document_get_element_by_id (
-                       document, "-x-evo-style-a");
-               if (style)
-                       remove_node (WEBKIT_DOM_NODE (style));
-       } else {
+       style = webkit_dom_document_get_element_by_id (document, "-x-evo-style-a");
+       if (style)
+               remove_node (WEBKIT_DOM_NODE (style));
+
+       if (!active) {
                WebKitDOMHTMLHeadElement *head;
                head = webkit_dom_document_get_head (document);
 
@@ -6193,6 +6192,7 @@ remove_evolution_attributes (WebKitDOMElement *element)
        webkit_dom_element_remove_attribute (element, "data-new-message");
        webkit_dom_element_remove_attribute (element, "data-user-wrapped");
        webkit_dom_element_remove_attribute (element, "data-evo-plain-text");
+       webkit_dom_element_remove_attribute (element, "data-style");
        webkit_dom_element_remove_attribute (element, "spellcheck");
 }
 
@@ -6469,6 +6469,8 @@ process_elements (EHTMLEditorWebExtension *extension,
 
                        if (!to_plain_text) {
                                remove_base_attributes (
+                                       WEBKIT_DOM_ELEMENT (child));
+                               remove_base_attributes (
                                        WEBKIT_DOM_ELEMENT (first_child));
                                remove_evolution_attributes (
                                        WEBKIT_DOM_ELEMENT (first_child));