[evolution/wip/webkit2] EHTMLEditorSelection - Current font color is discarded after modifying the font size

[Milan Crha <mcrha src gnome org>]

commit 605bafae72a653961a1b4fdaaae9ef2fa6396a48
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Mar 2 12:52:29 2016 +0100

    EHTMLEditorSelection - Current font color is discarded after modifying the font size
    
    This covers both commit e0c6dda and commit 599242a (EHTMLEditorSelection - build fix) at once

 .../e-html-editor-selection-dom-functions.c        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/web-extensions/composer/e-html-editor-selection-dom-functions.c 
b/web-extensions/composer/e-html-editor-selection-dom-functions.c
index 50fc975..d3fdfa0 100644
--- a/web-extensions/composer/e-html-editor-selection-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-selection-dom-functions.c
@@ -3442,7 +3442,7 @@ set_font_style (WebKitDOMDocument *document,
                webkit_dom_node_append_child (
                        WEBKIT_DOM_NODE (el), node, NULL);
                name = webkit_dom_node_get_local_name (parent);
-               if (g_strcmp0 (name, element_name) == 0)
+               if (g_strcmp0 (name, element_name) == 0 && g_strcmp0 (name, "font") != 0)
                        webkit_dom_node_insert_before (
                                webkit_dom_node_get_parent_node (parent),
                                WEBKIT_DOM_NODE (el),