[evolution/wip/webkit2] Bug 761883 - Freeze when editing a specific Draft: GLib-GObject-WARNING **: invalid cast from 'WebKi

[Milan Crha <mcrha src gnome org>]

commit ffaafc28975f7c74ccb212ded683a9ce77610a05
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Mar 3 16:02:26 2016 +0100

    Bug 761883 - Freeze when editing a specific Draft: GLib-GObject-WARNING **: invalid cast from 
'WebKitDOMText' to 'WebKitDOMElement'

 .../composer/e-html-editor-view-dom-functions.c    |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 c561f76..aa49a73 100644
--- a/web-extensions/composer/e-html-editor-view-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-view-dom-functions.c
@@ -2824,8 +2824,12 @@ dom_merge_siblings_if_necessary (WebKitDOMDocument *document,
        if (!element)
                goto signature;
  repeat:
-       prev_element = WEBKIT_DOM_ELEMENT (webkit_dom_node_get_previous_sibling (
-               WEBKIT_DOM_NODE (element)));
+       child = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (element));
+       if (WEBKIT_DOM_IS_ELEMENT (prev_element))
+               prev_element = WEBKIT_DOM_ELEMENT (prev_element);
+       else
+               goto signature;
+
        equal_nodes = webkit_dom_node_is_equal_node (
                webkit_dom_node_clone_node (WEBKIT_DOM_NODE (element), FALSE),
                webkit_dom_node_clone_node (WEBKIT_DOM_NODE (prev_element), FALSE));