[evolution/wip/webkit-composer: 960/966] Rename EHTMLEditor's UI file

[Tomas Popela <tpopela src gnome org>]

commit 048db146b3bfe5ad4fa21b8e4519dcc4778afd9b
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 13:57:03 2014 +0200

    Rename EHTMLEditor's UI file

 e-util/Makefile.am                                 |    2 +-
 ...-editor-manager.ui => e-html-editor-manager.ui} |    0
 e-util/e-html-editor-private.h                     |    2 +-
 e-util/e-html-editor.c                             |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 6f89094..b1d7fe0 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -40,7 +40,7 @@ errordir = $(privdatadir)/errors
 @EVO_PLUGIN_RULE@
 
 ui_DATA = \
-       e-editor-manager.ui \
+       e-html-editor-manager.ui \
        e-send-options.ui \
        e-table-config.ui \
        e-timezone-dialog.ui \
diff --git a/e-util/e-editor-manager.ui b/e-util/e-html-editor-manager.ui
similarity index 100%
rename from e-util/e-editor-manager.ui
rename to e-util/e-html-editor-manager.ui
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index 13e387b..dc4658b 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -43,7 +43,7 @@
 #endif
 
 #define ACTION(name) (E_HTML_EDITOR_ACTION_##name (editor))
-#define WIDGET(name) (E_EDITOR_WIDGETS_##name (editor))
+#define WIDGET(name) (E_HTML_EDITOR_WIDGETS_##name (editor))
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-html-editor.c b/e-util/e-html-editor.c
index 485dc77..aeae537 100644
--- a/e-util/e-html-editor.c
+++ b/e-util/e-html-editor.c
@@ -873,7 +873,7 @@ e_html_editor_init (EHTMLEditor *editor)
        priv->html_editor_view = g_object_ref_sink (e_html_editor_view_new ());
        priv->selection = e_html_editor_view_get_selection (priv->html_editor_view);
 
-       filename = html_editor_find_ui_file ("e-editor-manager.ui");
+       filename = html_editor_find_ui_file ("e-html-editor-manager.ui");
        if (!gtk_ui_manager_add_ui_from_file (priv->manager, filename, &error)) {
                g_critical ("Couldn't load builder file: %s\n", error->message);
                g_clear_error (&error);