summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Popela <tpopela@redhat.com>2016-02-12 10:57:56 +0100
committerTomas Popela <tpopela@redhat.com>2016-02-12 11:00:34 +0100
commit7fa9a99cce23041b90e07172ac2f961517b82408 (patch)
tree3957e95007c02449afa59fc7724796e1b2f07eec
parent6c78a1e8988a2a85527896770686dd8122b98998 (diff)
downloadevolution-7fa9a99cce23041b90e07172ac2f961517b82408.tar.gz
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.
-rw-r--r--e-util/e-html-editor-view.c8
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 5f984fb15f..e9c39a821f 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));