GNOME.org
 

[evolution/wip/webkit-composer] Rename EEditorUtils to EHTMLEditorUtils

commit 1768cd8a8fd08ab766d64b73b80077523843f647
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Mar 28 14:34:53 2014 +0100

    Rename EEditorUtils to EHTMLEditorUtils

 doc/reference/evolution-util/Makefile.am           |    2 +-
 e-util/Makefile.am                                 |    4 +-
 e-util/e-editor-cell-dialog.c                      |   12 +++---
 e-util/e-editor-hrule-dialog.c                     |    2 +-
 e-util/e-editor-image-dialog.c                     |    6 ++--
 e-util/e-editor-link-dialog.c                      |   10 +++---
 e-util/e-editor-table-dialog.c                     |    4 +-
 e-util/e-html-editor-actions.c                     |   36 ++++++++++----------
 e-util/e-html-editor-selection.c                   |   36 ++++++++++----------
 e-util/{e-editor-utils.c => e-html-editor-utils.c} |   16 ++++----
 e-util/{e-editor-utils.h => e-html-editor-utils.h} |   12 +++---
 e-util/e-html-editor.c                             |   10 +++---
 e-util/e-util.h                                    |    2 +-
 13 files changed, 76 insertions(+), 76 deletions(-)
---
diff --git a/doc/reference/evolution-util/Makefile.am b/doc/reference/evolution-util/Makefile.am
index 5d668fd..48d1d13 100644
--- a/doc/reference/evolution-util/Makefile.am
+++ b/doc/reference/evolution-util/Makefile.am
@@ -18,7 +18,7 @@ CFILE_GLOB = $(top_srcdir)/e-util/*.c
 IGNORE_HFILES = \
        e-html-editor-actions.h \
        e-html-editor-private.h \
-       e-editor-utils.h \
+       e-html-editor-utils.h \
        e-marshal.h \
        e-table-col-dnd.h \
        e-table-defines.h \
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index e4e9047..39b263d 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -188,7 +188,6 @@ evolution_util_include_HEADERS =  \
        e-editor-spell-check-dialog.h \
        e-editor-table-dialog.h \
        e-editor-text-dialog.h \
-       e-editor-utils.h \
        e-emoticon-action.h \
        e-emoticon-chooser-menu.h \
        e-emoticon-chooser.h \
@@ -210,6 +209,7 @@ evolution_util_include_HEADERS =  \
        e-focus-tracker.h \
        e-html-editor-actions.h \
        e-html-editor-selection.h \
+       e-html-editor-utils.h \
        e-html-editor-view.h \
        e-html-editor.h \
        e-html-utils.h \
@@ -459,7 +459,6 @@ libevolution_util_la_SOURCES = \
        e-editor-spell-check-dialog.c \
        e-editor-table-dialog.c \
        e-editor-text-dialog.c \
-       e-editor-utils.c \
        e-emoticon-action.c \
        e-emoticon-chooser-menu.c \
        e-emoticon-chooser.c \
@@ -482,6 +481,7 @@ libevolution_util_la_SOURCES = \
        e-html-editor-actions.c \
        e-html-editor-private.h \
        e-html-editor-selection.c \
+       e-html-editor-utils.c \
        e-html-editor-view.c \
        e-html-editor.c \
        e-html-utils.c \
diff --git a/e-util/e-editor-cell-dialog.c b/e-util/e-editor-cell-dialog.c
index d25f8d9..8f7a2d1 100644
--- a/e-util/e-editor-cell-dialog.c
+++ b/e-util/e-editor-cell-dialog.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include "e-color-combo.h"
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include "e-image-chooser-dialog.h"
 #include "e-misc-utils.h"
 
@@ -140,7 +140,7 @@ editor_cell_dialog_set_attribute (EEditorCellDialog *dialog,
 
                index = webkit_dom_html_table_cell_element_get_cell_index (
                                WEBKIT_DOM_HTML_TABLE_CELL_ELEMENT (dialog->priv->cell));
-               table = e_editor_dom_node_find_parent_element (
+               table = e_html_editor_dom_node_find_parent_element (
                                WEBKIT_DOM_NODE (dialog->priv->cell), "TABLE");
                if (!table) {
                        return;
@@ -169,7 +169,7 @@ editor_cell_dialog_set_attribute (EEditorCellDialog *dialog,
        } else if (dialog->priv->scope == SCOPE_ROW) {
                WebKitDOMElement *row;
 
-               row = e_editor_dom_node_find_parent_element (
+               row = e_html_editor_dom_node_find_parent_element (
                                WEBKIT_DOM_NODE (dialog->priv->cell), "TR");
                if (!row) {
                        return;
@@ -182,7 +182,7 @@ editor_cell_dialog_set_attribute (EEditorCellDialog *dialog,
                WebKitDOMElement *table;
                WebKitDOMHTMLCollection *rows;
 
-               table = e_editor_dom_node_find_parent_element (
+               table = e_html_editor_dom_node_find_parent_element (
                                WEBKIT_DOM_NODE (dialog->priv->cell), "TABLE");
                if (!table) {
                        return;
@@ -860,10 +860,10 @@ e_editor_cell_dialog_show (EEditorCellDialog *dialog,
        g_return_if_fail (E_IS_EDITOR_CELL_DIALOG (dialog));
        g_return_if_fail (cell != NULL);
 
-       dialog->priv->cell = e_editor_dom_node_find_parent_element (cell, "TD");
+       dialog->priv->cell = e_html_editor_dom_node_find_parent_element (cell, "TD");
        if (dialog->priv->cell == NULL) {
                dialog->priv->cell =
-                       e_editor_dom_node_find_parent_element (cell, "TH");
+                       e_html_editor_dom_node_find_parent_element (cell, "TH");
        }
 
        class = E_EDITOR_CELL_DIALOG_GET_CLASS (dialog);
diff --git a/e-util/e-editor-hrule-dialog.c b/e-util/e-editor-hrule-dialog.c
index 0138843..fe9aa78 100644
--- a/e-util/e-editor-hrule-dialog.c
+++ b/e-util/e-editor-hrule-dialog.c
@@ -23,7 +23,7 @@
 #endif
 
 #include "e-editor-hrule-dialog.h"
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include "e-html-editor-view.h"
 
 #include <glib/gi18n-lib.h>
diff --git a/e-util/e-editor-image-dialog.c b/e-util/e-editor-image-dialog.c
index 27d2059..09c531b 100644
--- a/e-util/e-editor-image-dialog.c
+++ b/e-util/e-editor-image-dialog.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include "e-image-chooser-dialog.h"
 
 #define E_EDITOR_IMAGE_DIALOG_GET_PRIVATE(obj) \
@@ -303,7 +303,7 @@ editor_image_dialog_set_url (EEditorImageDialog *dialog)
        const gchar *url;
 
        url = gtk_entry_get_text (GTK_ENTRY (dialog->priv->url_edit));
-       link = e_editor_dom_node_find_parent_element (
+       link = e_html_editor_dom_node_find_parent_element (
                WEBKIT_DOM_NODE (dialog->priv->image), "A");
 
        if (link) {
@@ -415,7 +415,7 @@ editor_image_dialog_show (GtkWidget *widget)
        gtk_spin_button_set_value (
                GTK_SPIN_BUTTON (dialog->priv->y_padding_edit), val);
 
-       link = e_editor_dom_node_find_parent_element (
+       link = e_html_editor_dom_node_find_parent_element (
                        WEBKIT_DOM_NODE (dialog->priv->image), "A");
        if (link) {
                tmp = webkit_dom_html_anchor_element_get_href (
diff --git a/e-util/e-editor-link-dialog.c b/e-util/e-editor-link-dialog.c
index 6cbeef1..f607a27 100644
--- a/e-util/e-editor-link-dialog.c
+++ b/e-util/e-editor-link-dialog.c
@@ -24,7 +24,7 @@
 
 #include "e-editor-link-dialog.h"
 #include "e-html-editor-selection.h"
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include "e-html-editor-view.h"
 
 #include <glib/gi18n-lib.h>
@@ -126,7 +126,7 @@ editor_link_dialog_ok (EEditorLinkDialog *dialog)
        }
 
        range = webkit_dom_dom_selection_get_range_at (dom_selection, 0, NULL);
-       link = e_editor_dom_node_find_parent_element (
+       link = e_html_editor_dom_node_find_parent_element (
                        webkit_dom_range_get_start_container (range, NULL), "A");
        if (!link) {
                if ((webkit_dom_range_get_start_container (range, NULL) !=
@@ -136,7 +136,7 @@ editor_link_dialog_ok (EEditorLinkDialog *dialog)
 
                        WebKitDOMDocumentFragment *fragment;
                        fragment = webkit_dom_range_extract_contents (range, NULL);
-                       link = e_editor_dom_node_find_child_element (
+                       link = e_html_editor_dom_node_find_child_element (
                                WEBKIT_DOM_NODE (fragment), "A");
                        webkit_dom_range_insert_node (
                                range, WEBKIT_DOM_NODE (fragment), NULL);
@@ -244,7 +244,7 @@ editor_link_dialog_show (GtkWidget *widget)
        }
 
        range = webkit_dom_dom_selection_get_range_at (dom_selection, 0, NULL);
-       link = e_editor_dom_node_find_parent_element (
+       link = e_html_editor_dom_node_find_parent_element (
                webkit_dom_range_get_start_container (range, NULL), "A");
        if (!link) {
                if ((webkit_dom_range_get_start_container (range, NULL) !=
@@ -254,7 +254,7 @@ editor_link_dialog_show (GtkWidget *widget)
 
                        WebKitDOMDocumentFragment *fragment;
                        fragment = webkit_dom_range_clone_contents (range, NULL);
-                       link = e_editor_dom_node_find_child_element (
+                       link = e_html_editor_dom_node_find_child_element (
                                        WEBKIT_DOM_NODE (fragment), "A");
                } else {
                        /* get element that was clicked on */
diff --git a/e-util/e-editor-table-dialog.c b/e-util/e-editor-table-dialog.c
index 4b66ad5..43a618e 100644
--- a/e-util/e-editor-table-dialog.c
+++ b/e-util/e-editor-table-dialog.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n-lib.h>
 
 #include "e-color-combo.h"
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include "e-image-chooser-dialog.h"
 #include "e-misc-utils.h"
 
@@ -593,7 +593,7 @@ editor_table_dialog_show (GtkWidget *widget)
                WebKitDOMRange *range;
 
                range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
-               table = e_editor_dom_node_find_parent_element (
+               table = e_html_editor_dom_node_find_parent_element (
                        webkit_dom_range_get_start_container (range, NULL), "TABLE");
 
                if (!table) {
diff --git a/e-util/e-html-editor-actions.c b/e-util/e-html-editor-actions.c
index b480b06..332da90 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -29,7 +29,7 @@
 #include "e-html-editor.h"
 #include "e-html-editor-private.h"
 #include "e-html-editor-actions.h"
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include "e-emoticon-action.h"
 #include "e-emoticon-chooser.h"
 #include "e-image-chooser-dialog.h"
@@ -141,9 +141,9 @@ action_context_delete_cell_cb (GtkAction *action,
 
        g_return_if_fail (editor->priv->table_cell != NULL);
 
-       cell = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
+       cell = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
        if (!cell) {
-               cell = e_editor_dom_node_find_parent_element (
+               cell = e_html_editor_dom_node_find_parent_element (
                                        editor->priv->table_cell, "TH");
        }
        g_return_if_fail (cell != NULL);
@@ -176,14 +176,14 @@ action_context_delete_column_cb (GtkAction *action,
        g_return_if_fail (editor->priv->table_cell != NULL);
 
        /* Find TD in which the selection starts */
-       cell = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
+       cell = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
        if (!cell) {
-               cell = e_editor_dom_node_find_parent_element (
+               cell = e_html_editor_dom_node_find_parent_element (
                                        editor->priv->table_cell, "TH");
        }
        g_return_if_fail (cell != NULL);
 
-       table = e_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (cell), "TABLE");
+       table = e_html_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (cell), "TABLE");
        g_return_if_fail (table != NULL);
 
        rows = webkit_dom_html_table_element_get_rows (
@@ -211,7 +211,7 @@ action_context_delete_row_cb (GtkAction *action,
 
        g_return_if_fail (editor->priv->table_cell != NULL);
 
-       row = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TR");
+       row = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TR");
        g_return_if_fail (row != NULL);
 
        webkit_dom_node_remove_child (
@@ -227,7 +227,7 @@ action_context_delete_table_cb (GtkAction *action,
 
        g_return_if_fail (editor->priv->table_cell != NULL);
 
-       table = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TABLE");
+       table = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TABLE");
        g_return_if_fail (table != NULL);
 
        webkit_dom_node_remove_child (
@@ -244,14 +244,14 @@ action_context_insert_column_after_cb (GtkAction *action,
 
        g_return_if_fail (editor->priv->table_cell != NULL);
 
-       cell = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
+       cell = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
        if (!cell) {
-               cell = e_editor_dom_node_find_parent_element (
+               cell = e_html_editor_dom_node_find_parent_element (
                                        editor->priv->table_cell, "TH");
        }
        g_return_if_fail (cell != NULL);
 
-       row = e_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (cell), "TR");
+       row = e_html_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (cell), "TR");
        g_return_if_fail (row != NULL);
 
        /* Get the first row in the table */
@@ -280,14 +280,14 @@ action_context_insert_column_before_cb (GtkAction *action,
 
        g_return_if_fail (editor->priv->table_cell != NULL);
 
-       cell = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
+       cell = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TD");
        if (!cell) {
-               cell = e_editor_dom_node_find_parent_element (
+               cell = e_html_editor_dom_node_find_parent_element (
                                editor->priv->table_cell, "TH");
        }
        g_return_if_fail (cell != NULL);
 
-       row = e_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (cell), "TR");
+       row = e_html_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (cell), "TR");
        g_return_if_fail (row != NULL);
 
        /* Get the first row in the table */
@@ -318,10 +318,10 @@ action_context_insert_row_above_cb (GtkAction *action,
 
        g_return_if_fail (editor->priv->table_cell != NULL);
 
-       row = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TR");
+       row = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TR");
        g_return_if_fail (row != NULL);
 
-       table = e_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (row), "TABLE");
+       table = e_html_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (row), "TABLE");
        g_return_if_fail (table != NULL);
 
        index = webkit_dom_html_table_row_element_get_row_index (
@@ -351,10 +351,10 @@ action_context_insert_row_below_cb (GtkAction *action,
 
        g_return_if_fail (editor->priv->table_cell != NULL);
 
-       row = e_editor_dom_node_find_parent_element (editor->priv->table_cell, "TR");
+       row = e_html_editor_dom_node_find_parent_element (editor->priv->table_cell, "TR");
        g_return_if_fail (row != NULL);
 
-       table = e_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (row), "TABLE");
+       table = e_html_editor_dom_node_find_parent_element (WEBKIT_DOM_NODE (row), "TABLE");
        g_return_if_fail (table != NULL);
 
        index = webkit_dom_html_table_row_element_get_row_index (
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index f788620..fc6b6a9 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -25,7 +25,7 @@
 #include "e-html-editor-selection.h"
 #include "e-html-editor-view.h"
 #include "e-html-editor.h"
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 
 #include <e-util/e-util.h>
 
@@ -220,7 +220,7 @@ get_font_property (EHTMLEditorSelection *selection,
                return NULL;
 
        node = webkit_dom_range_get_common_ancestor_container (range, NULL);
-       element = e_editor_dom_node_find_parent_element (node, "FONT");
+       element = e_html_editor_dom_node_find_parent_element (node, "FONT");
        if (!element)
                return NULL;
 
@@ -1260,9 +1260,9 @@ e_html_editor_selection_get_block_format (EHTMLEditorSelection *selection)
 
        node = webkit_dom_range_get_start_container (range, NULL);
 
-       if (e_editor_dom_node_find_parent_element (node, "UL")) {
+       if (e_html_editor_dom_node_find_parent_element (node, "UL")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_UNORDERED_LIST;
-       } else if ((element = e_editor_dom_node_find_parent_element (node, "OL")) != NULL) {
+       } else if ((element = e_html_editor_dom_node_find_parent_element (node, "OL")) != NULL) {
                if (webkit_dom_element_has_attribute (element, "type")) {
                        gchar *type;
 
@@ -1279,23 +1279,23 @@ e_html_editor_selection_get_block_format (EHTMLEditorSelection *selection)
                } else {
                        result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST;
                }
-       } else if (e_editor_dom_node_find_parent_element (node, "PRE")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "PRE")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_PRE;
-       } else if (e_editor_dom_node_find_parent_element (node, "ADDRESS")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "ADDRESS")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_ADDRESS;
-       } else if (e_editor_dom_node_find_parent_element (node, "H1")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "H1")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_H1;
-       } else if (e_editor_dom_node_find_parent_element (node, "H2")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "H2")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_H2;
-       } else if (e_editor_dom_node_find_parent_element (node, "H3")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "H3")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_H3;
-       } else if (e_editor_dom_node_find_parent_element (node, "H4")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "H4")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_H4;
-       } else if (e_editor_dom_node_find_parent_element (node, "H5")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "H5")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_H5;
-       } else if (e_editor_dom_node_find_parent_element (node, "H6")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "H6")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_H6;
-       } else if ((element = e_editor_dom_node_find_parent_element (node, "BLOCKQUOTE")) != NULL) {
+       } else if ((element = e_html_editor_dom_node_find_parent_element (node, "BLOCKQUOTE")) != NULL) {
                if (element_has_class (element, "-x-evo-indented"))
                        result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH;
                else {
@@ -1306,7 +1306,7 @@ e_html_editor_selection_get_block_format (EHTMLEditorSelection *selection)
                        else
                                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_BLOCKQUOTE;
                }
-       } else if (e_editor_dom_node_find_parent_element (node, "P")) {
+       } else if (e_html_editor_dom_node_find_parent_element (node, "P")) {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH;
        } else {
                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH;
@@ -1805,7 +1805,7 @@ e_html_editor_selection_set_block_format (EHTMLEditorSelection *selection,
        if (block) {
                WebKitDOMElement *blockquote;
 
-               blockquote = e_editor_dom_node_find_parent_element (block, "BLOCKQUOTE");
+               blockquote = e_html_editor_dom_node_find_parent_element (block, "BLOCKQUOTE");
                if (!html_mode && blockquote && webkit_dom_element_has_attribute (blockquote, "type")) {
                        gchar *value;
 
@@ -2805,7 +2805,7 @@ e_html_editor_selection_set_monospaced (EHTMLEditorSelection *selection,
                    is_monospaced_element (WEBKIT_DOM_ELEMENT (node))) {
                        tt_element = WEBKIT_DOM_ELEMENT (node);
                } else {
-                       tt_element = e_editor_dom_node_find_parent_element (node, "FONT");
+                       tt_element = e_html_editor_dom_node_find_parent_element (node, "FONT");
 
                        if (!is_monospaced_element (tt_element)) {
                                g_object_unref (view);
@@ -3329,7 +3329,7 @@ e_html_editor_selection_unlink (EHTMLEditorSelection *selection)
        dom_selection = webkit_dom_dom_window_get_selection (window);
 
        range = webkit_dom_dom_selection_get_range_at (dom_selection, 0, NULL);
-       link = e_editor_dom_node_find_parent_element (
+       link = e_html_editor_dom_node_find_parent_element (
                        webkit_dom_range_get_start_container (range, NULL), "A");
 
        if (!link) {
@@ -4645,7 +4645,7 @@ e_html_editor_selection_wrap_lines (EHTMLEditorSelection *selection)
                        paragraph = parent;
                } else {
                        WebKitDOMElement *parent_div =
-                               e_editor_dom_node_find_parent_element (parent, "DIV");
+                               e_html_editor_dom_node_find_parent_element (parent, "DIV");
 
                        if (element_has_class (parent_div, "-x-evo-paragraph")) {
                                paragraph = WEBKIT_DOM_NODE (parent_div);
diff --git a/e-util/e-editor-utils.c b/e-util/e-html-editor-utils.c
similarity index 87%
rename from e-util/e-editor-utils.c
rename to e-util/e-html-editor-utils.c
index 43b8c57..2807ea9 100644
--- a/e-util/e-editor-utils.c
+++ b/e-util/e-html-editor-utils.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-utils.c
+ * e-html-editor-utils.c
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,11 +22,11 @@
 #include <config.h>
 #endif
 
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include <string.h>
 
 /**
- * e_editor_dom_node_find_parent_element:
+ * e_html_editor_dom_node_find_parent_element:
  * @node: Start node
  * @tagname: Tag name of element to search
  *
@@ -38,8 +38,8 @@
  * then the @node is returned.
  */
 WebKitDOMElement *
-e_editor_dom_node_find_parent_element (WebKitDOMNode *node,
-                                       const gchar *tagname)
+e_html_editor_dom_node_find_parent_element (WebKitDOMNode *node,
+                                            const gchar *tagname)
 {
        gint taglen = strlen (tagname);
 
@@ -68,7 +68,7 @@ e_editor_dom_node_find_parent_element (WebKitDOMNode *node,
 }
 
 /**
- * e_editor_dom_node_find_child_element:
+ * e_html_editor_dom_node_find_child_element:
  * @node: Start node
  * @tagname: Tag name of element to search.
  *
@@ -80,8 +80,8 @@ e_editor_dom_node_find_parent_element (WebKitDOMNode *node,
  * then the @node is returned.
  */
 WebKitDOMElement *
-e_editor_dom_node_find_child_element (WebKitDOMNode *node,
-                                      const gchar *tagname)
+e_html_editor_dom_node_find_child_element (WebKitDOMNode *node,
+                                           const gchar *tagname)
 {
        WebKitDOMNode *start_node = node;
        gint taglen = strlen (tagname);
diff --git a/e-util/e-editor-utils.h b/e-util/e-html-editor-utils.h
similarity index 83%
rename from e-util/e-editor-utils.h
rename to e-util/e-html-editor-utils.h
index b41a9ab..7331a87 100644
--- a/e-util/e-editor-utils.h
+++ b/e-util/e-html-editor-utils.h
@@ -1,5 +1,5 @@
 /*
- * e-editor-utils.h
+ * e-html-editor-utils.h
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,23 +22,23 @@
 #error "Only <e-util/e-util.h> should be included directly."
 #endif
 
-#ifndef E_EDITOR_UTILS_H
-#define E_EDITOR_UTILS_H
+#ifndef E_HTML_EDITOR_UTILS_H
+#define E_HTML_EDITOR_UTILS_H
 
 #include <webkit/webkitdom.h>
 
 G_BEGIN_DECLS
 
 WebKitDOMElement *
-               e_editor_dom_node_find_parent_element
+               e_html_editor_dom_node_find_parent_element
                                                (WebKitDOMNode *node,
                                                 const gchar *tagname);
 
 WebKitDOMElement *
-               e_editor_dom_node_find_child_element
+               e_html_editor_dom_node_find_child_element
                                                (WebKitDOMNode *node,
                                                 const gchar *tagname);
 
 G_END_DECLS
 
-#endif /* E_EDITOR_UTILS_H */
+#endif /* E_HTML_EDITOR_UTILS_H */
diff --git a/e-util/e-html-editor.c b/e-util/e-html-editor.c
index a85428f..8bf7995 100644
--- a/e-util/e-html-editor.c
+++ b/e-util/e-html-editor.c
@@ -31,7 +31,7 @@
 #include "e-alert-dialog.h"
 #include "e-alert-sink.h"
 #include "e-html-editor-private.h"
-#include "e-editor-utils.h"
+#include "e-html-editor-utils.h"
 #include "e-html-editor-selection.h"
 
 #define E_HTML_EDITOR_GET_PRIVATE(obj) \
@@ -367,12 +367,12 @@ html_editor_update_actions (EHTMLEditor *editor,
         *   - Cursor is on an image that has a URL or target.
         */
        visible = (WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (node) ||
-               (e_editor_dom_node_find_parent_element (node, "A") != NULL));
+               (e_html_editor_dom_node_find_parent_element (node, "A") != NULL));
        gtk_action_set_visible (ACTION (CONTEXT_REMOVE_LINK), visible);
 
        visible = (WEBKIT_DOM_IS_HTML_TABLE_CELL_ELEMENT (node) ||
-               (e_editor_dom_node_find_parent_element (node, "TD") != NULL) ||
-               (e_editor_dom_node_find_parent_element (node, "TH") != NULL));
+               (e_html_editor_dom_node_find_parent_element (node, "TD") != NULL) ||
+               (e_html_editor_dom_node_find_parent_element (node, "TH") != NULL));
        gtk_action_set_visible (ACTION (CONTEXT_DELETE_CELL), visible);
        gtk_action_set_visible (ACTION (CONTEXT_DELETE_COLUMN), visible);
        gtk_action_set_visible (ACTION (CONTEXT_DELETE_ROW), visible);
@@ -388,7 +388,7 @@ html_editor_update_actions (EHTMLEditor *editor,
 
        /* Note the |= (cursor must be in a table cell). */
        visible |= (WEBKIT_DOM_IS_HTML_TABLE_ELEMENT (node) ||
-               (e_editor_dom_node_find_parent_element (node, "TABLE") != NULL));
+               (e_html_editor_dom_node_find_parent_element (node, "TABLE") != NULL));
        gtk_action_set_visible (ACTION (CONTEXT_PROPERTIES_TABLE), visible);
 
        /********************** Spell Check Suggestions **********************/
diff --git a/e-util/e-util.h b/e-util/e-util.h
index d992af7..6aa415b 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -103,7 +103,6 @@
 #include <e-util/e-editor-spell-check-dialog.h>
 #include <e-util/e-editor-table-dialog.h>
 #include <e-util/e-editor-text-dialog.h>
-#include <e-util/e-editor-utils.h>
 #include <e-util/e-emoticon-action.h>
 #include <e-util/e-emoticon-chooser-menu.h>
 #include <e-util/e-emoticon-chooser.h>
@@ -125,6 +124,7 @@
 #include <e-util/e-focus-tracker.h>
 #include <e-util/e-html-editor-actions.h>
 #include <e-util/e-html-editor-selection.h>
+#include <e-util/e-html-editor-utils.h>
 #include <e-util/e-html-editor-view.h>
 #include <e-util/e-html-editor.h>
 #include <e-util/e-html-utils.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]