[evolution/gtk-builder: 4/5] Rename e_load_ui_definition() to e_load_ui_manager_definition().

[Matthew Barnes <mbarnes src gnome org>]

commit 17e0b5079114adf9cfa0b8cf4c0a11aae385790b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Sep 24 21:37:42 2009 -0400

    Rename e_load_ui_definition() to e_load_ui_manager_definition().

 e-util/e-util.c                  |    6 +++---
 e-util/e-util.h                  |    2 +-
 mail/e-mail-browser.c            |    2 +-
 modules/mail/e-mail-shell-view.c |    3 ++-
 shell/e-shell-view.c             |    3 ++-
 shell/e-shell-window-actions.c   |    2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 533b3ef..310bd47 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -281,7 +281,7 @@ e_lookup_action_group (GtkUIManager *ui_manager,
 }
 
 /**
- * e_load_ui_definition:
+ * e_load_ui_manager_definition:
  * @ui_manager: a #GtkUIManager
  * @basename: basename of the UI definition file
  *
@@ -293,8 +293,8 @@ e_lookup_action_group (GtkUIManager *ui_manager,
  *          unmerge the UI with gtk_ui_manager_remove_ui().
  **/
 guint
-e_load_ui_definition (GtkUIManager *ui_manager,
-                      const gchar *basename)
+e_load_ui_manager_definition (GtkUIManager *ui_manager,
+                              const gchar *basename)
 {
 	gchar *filename;
 	guint merge_id;
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 16b3373..59c8ce7 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -58,7 +58,7 @@ GtkAction *	e_lookup_action			(GtkUIManager *ui_manager,
 						 const gchar *action_name);
 GtkActionGroup *e_lookup_action_group		(GtkUIManager *ui_manager,
 						 const gchar *group_name);
-guint		e_load_ui_definition		(GtkUIManager *ui_manager,
+guint		e_load_ui_manager_definition	(GtkUIManager *ui_manager,
 						 const gchar *basename);
 gint		e_action_compare_by_label	(GtkAction *action1,
 						 GtkAction *action2);
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 88e6202..e605e27 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -440,7 +440,7 @@ mail_browser_constructed (GObject *object)
 		G_N_ELEMENTS (mail_browser_entries), object);
 	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
 
-	e_load_ui_definition (ui_manager, E_MAIL_READER_UI_DEFINITION);
+	e_load_ui_manager_definition (ui_manager, E_MAIL_READER_UI_DEFINITION);
 	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
 
 	merge_id = gtk_ui_manager_new_merge_id (ui_manager);
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 346d0fe..631a29c 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -68,7 +68,8 @@ mail_shell_view_toggled (EShellView *shell_view)
 	basename = E_MAIL_READER_UI_DEFINITION;
 
 	if (view_is_active && priv->merge_id == 0) {
-		priv->merge_id = e_load_ui_definition (ui_manager, basename);
+		priv->merge_id = e_load_ui_manager_definition (
+			ui_manager, basename);
 		e_mail_reader_create_charset_menu (
 			E_MAIL_READER (priv->mail_shell_content),
 			ui_manager, priv->merge_id);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 3e8bd94..00ed5cb 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -438,7 +438,8 @@ shell_view_toggled (EShellView *shell_view)
 	id = shell_view_class->ui_manager_id;
 
 	if (view_is_active && priv->merge_id == 0) {
-		priv->merge_id = e_load_ui_definition (ui_manager, basename);
+		priv->merge_id = e_load_ui_manager_definition (
+			ui_manager, basename);
 		e_plugin_ui_enable_manager (ui_manager, id);
 
 	} else if (!view_is_active && priv->merge_id != 0) {
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 46cb321..1ba9a19 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1874,7 +1874,7 @@ e_shell_window_actions_init (EShellWindow *shell_window)
 
 	ui_manager = e_shell_window_get_ui_manager (shell_window);
 
-	e_load_ui_definition (ui_manager, "evolution-shell.ui");
+	e_load_ui_manager_definition (ui_manager, "evolution-shell.ui");
 
 	/* Shell Actions */
 	action_group = ACTION_GROUP (SHELL);