[evolution/gnome-3-18] EHTMLEditorSelection - Current font color is discarded after modifying the font size

[Tomas Popela <tpopela src gnome org>]

commit e5f4c86cf312a7f8a13ef466d7ca7842e97e16b5
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Oct 2 13:10:01 2015 +0200

    EHTMLEditorSelection - Current font color is discarded after modifying the font size
    
    Before this change a newly created FONT element with the right size is inserted
    after the FONT element that's defining a color. After this change the size FONT
    element is inserted on the right position inside the color FONT element.

 e-util/e-html-editor-selection.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index 109ea7a..00eb81b 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -3242,7 +3242,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_strcmp (name, "font") != 0)
                        webkit_dom_node_insert_before (
                                webkit_dom_node_get_parent_node (parent),
                                WEBKIT_DOM_NODE (el),