[evolution/wip/webkit-composer: 305/372] Fix detection of font format in HTML mode.

[Tomas Popela <tpopela src gnome org>]

commit 2d9c3813a03e328f13567af5f4d0ef82f8838b4e
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Sep 20 08:29:34 2013 +0200

    Fix detection of font format in HTML mode.

 e-util/e-editor-selection.c |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/e-util/e-editor-selection.c b/e-util/e-editor-selection.c
index 7d38158..4b8ee8a 100644
--- a/e-util/e-editor-selection.c
+++ b/e-util/e-editor-selection.c
@@ -1770,6 +1770,7 @@ e_editor_selection_is_bold (EEditorSelection *selection)
        WebKitDOMDocument *document;
        WebKitDOMDOMWindow *window;
        WebKitDOMNode *node;
+       WebKitDOMElement *element;
        WebKitDOMRange *range;
 
        g_return_val_if_fail (E_IS_EDITOR_SELECTION (selection), FALSE);
@@ -1795,8 +1796,13 @@ e_editor_selection_is_bold (EEditorSelection *selection)
        }
        g_free (text_content);
 
+       if (WEBKIT_DOM_IS_ELEMENT (node))
+               element = WEBKIT_DOM_ELEMENT (node);
+       else
+               element = webkit_dom_node_get_parent_element (node);
+
        style = webkit_dom_dom_window_get_computed_style (
-                       window, webkit_dom_node_get_parent_element (node), NULL);
+                       window, element, NULL);
        value = webkit_dom_css_style_declaration_get_property_value (style, "font-weight");
 
        if (g_strstr_len (value, -1, "normal"))
@@ -1860,6 +1866,7 @@ e_editor_selection_is_italic (EEditorSelection *selection)
        WebKitDOMDocument *document;
        WebKitDOMDOMWindow *window;
        WebKitDOMNode *node;
+       WebKitDOMElement *element;
        WebKitDOMRange *range;
 
        g_return_val_if_fail (E_IS_EDITOR_SELECTION (selection), FALSE);
@@ -1885,8 +1892,13 @@ e_editor_selection_is_italic (EEditorSelection *selection)
        }
        g_free (text_content);
 
+       if (WEBKIT_DOM_IS_ELEMENT (node))
+               element = WEBKIT_DOM_ELEMENT (node);
+       else
+               element = webkit_dom_node_get_parent_element (node);
+
        style = webkit_dom_dom_window_get_computed_style (
-                       window, webkit_dom_node_get_parent_element (node), NULL);
+                       window, element, NULL);
        value = webkit_dom_css_style_declaration_get_property_value (style, "font-style");
 
        if (g_strstr_len (value, -1, "italic"))
@@ -2193,6 +2205,7 @@ e_editor_selection_is_strike_through (EEditorSelection *selection)
        WebKitDOMDocument *document;
        WebKitDOMDOMWindow *window;
        WebKitDOMNode *node;
+       WebKitDOMElement *element;
        WebKitDOMRange *range;
 
        g_return_val_if_fail (E_IS_EDITOR_SELECTION (selection), FALSE);
@@ -2218,8 +2231,13 @@ e_editor_selection_is_strike_through (EEditorSelection *selection)
        }
        g_free (text_content);
 
+       if (WEBKIT_DOM_IS_ELEMENT (node))
+               element = WEBKIT_DOM_ELEMENT (node);
+       else
+               element = webkit_dom_node_get_parent_element (node);
+
        style = webkit_dom_dom_window_get_computed_style (
-                       window, webkit_dom_node_get_parent_element (node), NULL);
+                       window, element, NULL);
        value = webkit_dom_css_style_declaration_get_property_value (style, "text-decoration");
 
        if (g_strstr_len (value, -1, "line-through"))
@@ -2419,6 +2437,7 @@ e_editor_selection_is_underline (EEditorSelection *selection)
        WebKitDOMDocument *document;
        WebKitDOMDOMWindow *window;
        WebKitDOMNode *node;
+       WebKitDOMElement *element;
        WebKitDOMRange *range;
 
        g_return_val_if_fail (E_IS_EDITOR_SELECTION (selection), FALSE);
@@ -2444,8 +2463,13 @@ e_editor_selection_is_underline (EEditorSelection *selection)
        }
        g_free (text_content);
 
+       if (WEBKIT_DOM_IS_ELEMENT (node))
+               element = WEBKIT_DOM_ELEMENT (node);
+       else
+               element = webkit_dom_node_get_parent_element (node);
+
        style = webkit_dom_dom_window_get_computed_style (
-                       window, webkit_dom_node_get_parent_element (node), NULL);
+                       window, element, NULL);
        value = webkit_dom_css_style_declaration_get_property_value (style, "text-decoration");
 
        if (g_strstr_len (value, -1, "underline"))