From 8fa63f0228ec90e926cf280edaba7430fd136fca Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 6 Mar 2015 12:27:19 +0100 Subject: [PATCH] EHTMLEditorView - Make get_parent_block_element public --- e-util/e-html-editor-hrule-dialog.c | 24 ------------------------ e-util/e-html-editor-view.c | 2 +- e-util/e-html-editor-view.h | 2 ++ 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/e-util/e-html-editor-hrule-dialog.c b/e-util/e-html-editor-hrule-dialog.c index 52aafab28f..1d1dedfbe5 100644 --- a/e-util/e-html-editor-hrule-dialog.c +++ b/e-util/e-html-editor-hrule-dialog.c @@ -25,7 +25,6 @@ #include "e-html-editor-hrule-dialog.h" #include "e-html-editor-utils.h" #include "e-html-editor-view.h" -#include "e-web-view.h" #include #include @@ -207,29 +206,6 @@ html_editor_hrule_dialog_hide (GtkWidget *widget) GTK_WIDGET_CLASS (e_html_editor_hrule_dialog_parent_class)->hide (widget); } -static WebKitDOMElement * -get_parent_block_element (WebKitDOMNode *node) -{ - WebKitDOMElement *parent = webkit_dom_node_get_parent_element (node); - - if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (parent)) - return WEBKIT_DOM_ELEMENT (node); - - while (parent && - !WEBKIT_DOM_IS_HTML_DIV_ELEMENT (parent) && - !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_HEADING_ELEMENT (parent) && - !element_has_tag (parent, "address")) { - parent = webkit_dom_node_get_parent_element ( - WEBKIT_DOM_NODE (parent)); - } - - return parent; -} - static void html_editor_hrule_dialog_show (GtkWidget *widget) { diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c index 603d93a6a7..0a9c466fd0 100644 --- a/e-util/e-html-editor-view.c +++ b/e-util/e-html-editor-view.c @@ -261,7 +261,7 @@ html_editor_view_should_show_delete_interface_for_element (EHTMLEditorView *view return FALSE; } -static WebKitDOMElement * +WebKitDOMElement * get_parent_block_element (WebKitDOMNode *node) { WebKitDOMElement *parent = webkit_dom_node_get_parent_element (node); diff --git a/e-util/e-html-editor-view.h b/e-util/e-html-editor-view.h index cef99b9e72..3215f0df82 100644 --- a/e-util/e-html-editor-view.h +++ b/e-util/e-html-editor-view.h @@ -184,6 +184,8 @@ void e_html_editor_view_set_is_message_from_edit_as_new void e_html_editor_view_set_remove_initial_input_line (EHTMLEditorView *view, gboolean value); +WebKitDOMElement * + get_parent_block_element (WebKitDOMNode *node); G_END_DECLS #endif /* E_HTML_EDITOR_VIEW_H */