Use consistent variable names for GtkUIManager

3 files changed, 22 insertions, 22 deletions

diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 2af7a63fcd..a1fe1cafd4 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -595,12 +595,12 @@ void
 e_composer_actions_init (EMsgComposer *composer)
 {
 	GtkActionGroup *action_group;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	gboolean visible;
 
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
-	manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer));
+	ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer));
 
 	/* Composer Actions */
 	action_group = composer->priv->composer_actions;
@@ -612,7 +612,7 @@ e_composer_actions_init (EMsgComposer *composer)
 	gtk_action_group_add_toggle_actions (
 		action_group, toggle_entries,
 		G_N_ELEMENTS (toggle_entries), composer);
-	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
 
 	/* Character Set Actions */
 	action_group = composer->priv->charset_actions;
@@ -621,7 +621,7 @@ e_composer_actions_init (EMsgComposer *composer)
 	e_charset_add_radio_actions (
 		action_group, "charset-", composer->priv->charset,
 		G_CALLBACK (action_charset_cb), composer);
-	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
 
 	/* Fine Tuning */
 
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index a6fe8720f5..baf459c43a 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -21,14 +21,14 @@
 static void
 composer_setup_charset_menu (EMsgComposer *composer)
 {
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	const gchar *path;
 	GList *list;
 	guint merge_id;
 
-	manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer));
+	ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer));
 	path = "/main-menu/edit-menu/pre-spell-check/charset-menu";
-	merge_id = gtk_ui_manager_new_merge_id (manager);
+	merge_id = gtk_ui_manager_new_merge_id (ui_manager);
 
 	list = gtk_action_group_list_actions (composer->priv->charset_actions);
 	list = g_list_sort (list, (GCompareFunc) e_action_compare_by_label);
@@ -37,7 +37,7 @@ composer_setup_charset_menu (EMsgComposer *composer)
 		GtkAction *action = list->data;
 
 		gtk_ui_manager_add_ui (
-			manager, merge_id, path,
+			ui_manager, merge_id, path,
 			gtk_action_get_name (action),
 			gtk_action_get_name (action),
 			GTK_UI_MANAGER_AUTO, FALSE);
@@ -45,23 +45,23 @@ composer_setup_charset_menu (EMsgComposer *composer)
 		list = g_list_delete_link (list, list);
 	}
 
-	gtk_ui_manager_ensure_update (manager);
+	gtk_ui_manager_ensure_update (ui_manager);
 }
 
 static void
 composer_setup_recent_menu (EMsgComposer *composer)
 {
 	EAttachmentView *view;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkAction *action;
 	const gchar *action_name;
 	const gchar *path;
 	guint merge_id;
 
 	view = e_msg_composer_get_attachment_view (composer);
-	manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer));
+	ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer));
 	path = "/main-menu/insert-menu/insert-menu-top/recent-placeholder";
-	merge_id = gtk_ui_manager_new_merge_id (manager);
+	merge_id = gtk_ui_manager_new_merge_id (ui_manager);
 	action_name = "recent-menu";
 
 	action = e_attachment_view_recent_action_new (
@@ -72,12 +72,12 @@ composer_setup_recent_menu (EMsgComposer *composer)
 			composer->priv->composer_actions, action);
 
 		gtk_ui_manager_add_ui (
-			manager, merge_id, path,
+			ui_manager, merge_id, path,
 			action_name, action_name,
 			GTK_UI_MANAGER_AUTO, FALSE);
 	}
 
-	gtk_ui_manager_ensure_update (manager);
+	gtk_ui_manager_ensure_update (ui_manager);
 }
 
 void
@@ -86,7 +86,7 @@ e_composer_private_init (EMsgComposer *composer)
 	EMsgComposerPrivate *priv = composer->priv;
 
 	GtkhtmlEditor *editor;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkWidget *container;
 	GtkWidget *widget;
 	GtkWidget *send_widget;
@@ -95,7 +95,7 @@ e_composer_private_init (EMsgComposer *composer)
 	GError *error = NULL;
 
 	editor = GTKHTML_EDITOR (composer);
-	manager = gtkhtml_editor_get_ui_manager (editor);
+	ui_manager = gtkhtml_editor_get_ui_manager (editor);
 
 	priv->charset_actions = gtk_action_group_new ("charset");
 	priv->composer_actions = gtk_action_group_new ("composer");
@@ -121,12 +121,12 @@ e_composer_private_init (EMsgComposer *composer)
 	e_composer_actions_init (composer);
 
 	filename = e_composer_find_data_file ("evolution-composer.ui");
-	gtk_ui_manager_add_ui_from_file (manager, filename, &error);
+	gtk_ui_manager_add_ui_from_file (ui_manager, filename, &error);
 	g_free (filename);
 
 	/* We set the send button as important to have a label */
 	path = "/main-toolbar/pre-main-toolbar/send";
-	send_widget = gtk_ui_manager_get_widget (manager, path);
+	send_widget = gtk_ui_manager_get_widget (ui_manager, path);
 	gtk_tool_item_set_is_important (GTK_TOOL_ITEM (send_widget), TRUE);
 
 	composer_setup_charset_menu (composer);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index dde9ff40aa..927c08aae3 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2233,7 +2233,7 @@ msg_composer_init (EMsgComposer *composer)
 	GdkDragAction drag_actions;
 	GtkTargetList *target_list;
 	GtkTargetEntry *targets;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkhtmlEditor *editor;
 	GtkHTML *html;
 	const gchar *id;
@@ -2245,7 +2245,7 @@ msg_composer_init (EMsgComposer *composer)
 
 	editor = GTKHTML_EDITOR (composer);
 	html = gtkhtml_editor_get_html (editor);
-	manager = gtkhtml_editor_get_ui_manager (editor);
+	ui_manager = gtkhtml_editor_get_ui_manager (editor);
 	view = e_msg_composer_get_attachment_view (composer);
 	all_composers = g_slist_prepend (all_composers, composer);
 	table = E_COMPOSER_HEADER_TABLE (composer->priv->header_table);
@@ -2326,8 +2326,8 @@ msg_composer_init (EMsgComposer *composer)
 	gtkhtml_editor_set_changed (editor, FALSE);
 
 	id = "org.gnome.evolution.composer";
-	e_plugin_ui_register_manager (manager, id, composer);
-	e_plugin_ui_enable_manager (manager, id);
+	e_plugin_ui_register_manager (ui_manager, id, composer);
+	e_plugin_ui_enable_manager (ui_manager, id);
 }
 
 GType