aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Popela <tpopela@redhat.com>2014-08-14 21:03:50 +0800
committerTomas Popela <tpopela@redhat.com>2014-08-14 21:03:50 +0800
commit915bb0b5425da855e019fb57a41c837d5ac4313e (patch)
tree73b9370d6d18769be0b2b13d5deb3f927d7ddc66
parentfe3a3c518bf39a4f01c2d4666d9f80708a67fe56 (diff)
downloadgsoc2013-evolution-915bb0b5425da855e019fb57a41c837d5ac4313e.tar
gsoc2013-evolution-915bb0b5425da855e019fb57a41c837d5ac4313e.tar.gz
gsoc2013-evolution-915bb0b5425da855e019fb57a41c837d5ac4313e.tar.bz2
gsoc2013-evolution-915bb0b5425da855e019fb57a41c837d5ac4313e.tar.lz
gsoc2013-evolution-915bb0b5425da855e019fb57a41c837d5ac4313e.tar.xz
gsoc2013-evolution-915bb0b5425da855e019fb57a41c837d5ac4313e.tar.zst
gsoc2013-evolution-915bb0b5425da855e019fb57a41c837d5ac4313e.zip
EHTMLEditorView - Fix critical warning when creating Address and Header 1 - 6 blocks
-rw-r--r--e-util/e-html-editor-view.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 8b92b3d791..e5887ef3a6 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -220,7 +220,9 @@ get_parent_block_element (WebKitDOMNode *node)
!WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (parent) &&
!WEBKIT_DOM_IS_HTMLU_LIST_ELEMENT (parent) &&
!WEBKIT_DOM_IS_HTMLO_LIST_ELEMENT (parent) &&
- !WEBKIT_DOM_IS_HTML_PRE_ELEMENT (parent)) {
+ !WEBKIT_DOM_IS_HTML_PRE_ELEMENT (parent) &&
+ !WEBKIT_DOM_IS_HTML_HEADING_ELEMENT (parent) &&
+ !element_has_tag (parent, "address")) {
parent = webkit_dom_node_get_parent_element (
WEBKIT_DOM_NODE (parent));
}