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

[Tomas Popela <tpopela src gnome org>]

commit 7fa9a99cce23041b90e07172ac2f961517b82408
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Feb 12 10:57:56 2016 +0100

    Bug 761883 - Freeze when editing a specific Draft: GLib-GObject-WARNING **: invalid cast from 
'WebKitDOMText' to 'WebKitDOMElement'
    
    Bug title says everything. Don't try to cast a text to element.

 e-util/e-html-editor-view.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 5f984fb..e9c39a8 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -3262,8 +3262,12 @@ 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));