Use consistent variable names for GtkUIManager

13 files changed, 93 insertions, 91 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 6456a5ce04..5d842d673a 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -98,7 +98,7 @@ struct _CompEditorPrivate {
 	GtkWidget *attachment_view;
 
 	/* Manages menus and toolbars */
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 
 	gchar *summary;
 
@@ -1150,7 +1150,7 @@ comp_editor_setup_recent_menu (CompEditor *editor)
 	const gchar *path;
 	guint merge_id;
 
-	ui_manager = editor->priv->manager;
+	ui_manager = editor->priv->ui_manager;
 	view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
 	action_group = comp_editor_get_action_group (editor, "individual");
 	merge_id = gtk_ui_manager_new_merge_id (ui_manager);
@@ -1282,9 +1282,9 @@ comp_editor_dispose (GObject *object)
 		priv->comp = NULL;
 	}
 
-	if (priv->manager != NULL) {
-		g_object_unref (priv->manager);
-		priv->manager = NULL;
+	if (priv->ui_manager != NULL) {
+		g_object_unref (priv->ui_manager);
+		priv->ui_manager = NULL;
 	}
 
 	/* Chain up to parent's dispose() method. */
@@ -1534,11 +1534,11 @@ comp_editor_init (CompEditor *editor)
 	priv->warned = FALSE;
 	priv->is_group_item = FALSE;
 
-	priv->manager = gtk_ui_manager_new ();
+	priv->ui_manager = gtk_ui_manager_new ();
 
 	gtk_window_add_accel_group (
 		GTK_WINDOW (editor),
-		gtk_ui_manager_get_accel_group (priv->manager));
+		gtk_ui_manager_get_accel_group (priv->ui_manager));
 
 	/* Setup Action Groups */
 
@@ -1549,7 +1549,7 @@ comp_editor_init (CompEditor *editor)
 		action_group, core_entries,
 		G_N_ELEMENTS (core_entries), editor);
 	gtk_ui_manager_insert_action_group (
-		priv->manager, action_group, 0);
+		priv->ui_manager, action_group, 0);
 	g_object_unref (action_group);
 
 	action_group = gtk_action_group_new ("individual");
@@ -1567,7 +1567,7 @@ comp_editor_init (CompEditor *editor)
 		E_CAL_COMPONENT_CLASS_PUBLIC,
 		G_CALLBACK (action_classification_cb), editor);
 	gtk_ui_manager_insert_action_group (
-		priv->manager, action_group, 0);
+		priv->ui_manager, action_group, 0);
 	g_object_unref (action_group);
 
 	action_group = gtk_action_group_new ("coordinated");
@@ -1577,7 +1577,7 @@ comp_editor_init (CompEditor *editor)
 		action_group, coordinated_toggle_entries,
 		G_N_ELEMENTS (coordinated_toggle_entries), editor);
 	gtk_ui_manager_insert_action_group (
-		priv->manager, action_group, 0);
+		priv->ui_manager, action_group, 0);
 	g_object_unref (action_group);
 
 	/* Fine Tuning */
@@ -1589,7 +1589,7 @@ comp_editor_init (CompEditor *editor)
 	action = comp_editor_get_action (editor, "save");
 	gtk_action_set_sensitive (action, FALSE);
 
-	gtk_ui_manager_add_ui_from_string (priv->manager, ui, -1, &error);
+	gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui, -1, &error);
 	if (error != NULL) {
 		g_warning ("%s: %s", G_STRFUNC, error->message);
 		g_error_free (error);
@@ -1940,7 +1940,7 @@ comp_editor_get_ui_manager (CompEditor *editor)
 {
 	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
 
-	return editor->priv->manager;
+	return editor->priv->ui_manager;
 }
 
 GtkAction *
@@ -1953,7 +1953,7 @@ comp_editor_get_action (CompEditor *editor,
 	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
 	g_return_val_if_fail (action_name != NULL, NULL);
 
-	iter = gtk_ui_manager_get_action_groups (editor->priv->manager);
+	iter = gtk_ui_manager_get_action_groups (editor->priv->ui_manager);
 	while (iter != NULL && action == NULL) {
 		GtkActionGroup *action_group = iter->data;
 
@@ -1975,7 +1975,7 @@ comp_editor_get_action_group (CompEditor *editor,
 	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
 	g_return_val_if_fail (group_name != NULL, NULL);
 
-	iter = gtk_ui_manager_get_action_groups (editor->priv->manager);
+	iter = gtk_ui_manager_get_action_groups (editor->priv->ui_manager);
 	while (iter != NULL) {
 		GtkActionGroup *action_group = iter->data;
 		const gchar *name;
@@ -1993,14 +1993,14 @@ GtkWidget *
 comp_editor_get_managed_widget (CompEditor *editor,
                                 const gchar *widget_path)
 {
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkWidget *widget;
 
 	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
 	g_return_val_if_fail (widget_path != NULL, NULL);
 
-	manager = comp_editor_get_ui_manager (editor);
-	widget = gtk_ui_manager_get_widget (manager, widget_path);
+	ui_manager = comp_editor_get_ui_manager (editor);
+	widget = gtk_ui_manager_get_widget (ui_manager, widget_path);
 	g_return_val_if_fail (widget != NULL, NULL);
 
 	return widget;
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index f32f24501d..7755894f6c 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -463,7 +463,7 @@ static void
 event_editor_init (EventEditor *ee)
 {
 	CompEditor *editor = COMP_EDITOR (ee);
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkActionGroup *action_group;
 	GtkAction *action;
 	GError *error = NULL;
@@ -486,9 +486,9 @@ event_editor_init (EventEditor *ee)
 		action_group, meeting_entries,
 		G_N_ELEMENTS (meeting_entries), ee);
 
-	manager = comp_editor_get_ui_manager (editor);
-	gtk_ui_manager_add_ui_from_string (manager, ui, -1, &error);
-	e_plugin_ui_register_manager ("event-editor", manager, ee);
+	ui_manager = comp_editor_get_ui_manager (editor);
+	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
+	e_plugin_ui_register_manager ("event-editor", ui_manager, ee);
 
 	if (error != NULL) {
 		g_critical ("%s: %s", G_STRFUNC, error->message);
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 4fbf35d916..b90bd6fb3c 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -134,15 +134,15 @@ static void
 memo_editor_init (MemoEditor *me)
 {
 	CompEditor *editor = COMP_EDITOR (me);
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GError *error = NULL;
 
 	me->priv = MEMO_EDITOR_GET_PRIVATE (me);
 	me->priv->updating = FALSE;
 
-	manager = comp_editor_get_ui_manager (editor);
-	gtk_ui_manager_add_ui_from_string (manager, ui, -1, &error);
-	e_plugin_ui_register_manager ("memo-editor", manager, me);
+	ui_manager = comp_editor_get_ui_manager (editor);
+	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
+	e_plugin_ui_register_manager ("memo-editor", ui_manager, me);
 
 	if (error != NULL) {
 		g_critical ("%s: %s", G_STRFUNC, error->message);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 4b8f8698b9..eef1d64468 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -302,7 +302,7 @@ static void
 task_editor_init (TaskEditor *te)
 {
 	CompEditor *editor = COMP_EDITOR (te);
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkActionGroup *action_group;
 	GError *error = NULL;
 
@@ -344,9 +344,9 @@ task_editor_init (TaskEditor *te)
 		action_group, assigned_task_entries,
 		G_N_ELEMENTS (assigned_task_entries), te);
 
-	manager = comp_editor_get_ui_manager (editor);
-	gtk_ui_manager_add_ui_from_string (manager, ui, -1, &error);
-	e_plugin_ui_register_manager ("task-editor", manager, te);
+	ui_manager = comp_editor_get_ui_manager (editor);
+	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
+	e_plugin_ui_register_manager ("task-editor", ui_manager, te);
 
 	if (error != NULL) {
 		g_critical ("%s: %s", G_STRFUNC, error->message);
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index e46aba4192..56ec7c5db1 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -606,12 +606,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;
@@ -623,7 +623,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;
@@ -632,7 +632,7 @@ e_composer_actions_init (EMsgComposer *composer)
 	e_charset_add_radio_actions (
 		action_group, 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 ab1e092513..1729aae9fa 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -21,21 +21,21 @@
 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));
 	list = gtk_action_group_list_actions (composer->priv->charset_actions);
 	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);
 
 	while (list != NULL) {
 		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);
@@ -43,23 +43,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 (
@@ -70,12 +70,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
@@ -84,7 +84,7 @@ e_composer_private_init (EMsgComposer *composer)
 	EMsgComposerPrivate *priv = composer->priv;
 
 	GtkhtmlEditor *editor;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkWidget *widget;
 	GtkWidget *container;
 	GtkWidget *send_widget;
@@ -93,7 +93,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");
@@ -119,12 +119,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 a2777294c6..3195255a52 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2468,7 +2468,7 @@ msg_composer_init (EMsgComposer *composer)
 	GdkDragAction drag_actions;
 	GtkTargetList *target_list;
 	GtkTargetEntry *targets;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkhtmlEditor *editor;
 	GtkHTML *html;
 	gint n_targets;
@@ -2479,7 +2479,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);
@@ -2560,7 +2560,7 @@ msg_composer_init (EMsgComposer *composer)
 	gtkhtml_editor_set_changed (editor, FALSE);
 
 	e_plugin_ui_register_manager (
-		"org.gnome.evolution.composer", manager, composer);
+		"org.gnome.evolution.composer", ui_manager, composer);
 }
 
 GType
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index c192ece939..c3ee13fe60 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -62,7 +62,7 @@ static gpointer parent_class;
 
 static void
 plugin_ui_registry_remove (EPluginUIHook *hook,
-                           GtkUIManager *manager)
+                           GtkUIManager *ui_manager)
 {
 	GHashTable *hash_table;
 
@@ -71,14 +71,14 @@ plugin_ui_registry_remove (EPluginUIHook *hook,
 	hash_table = g_hash_table_lookup (registry, hook);
 	g_return_if_fail (hash_table != NULL);
 
-	g_hash_table_remove (hash_table, manager);
+	g_hash_table_remove (hash_table, ui_manager);
 	if (g_hash_table_size (hash_table) == 0)
 		g_hash_table_remove (registry, hook);
 }
 
 static void
 plugin_ui_registry_insert (EPluginUIHook *hook,
-                           GtkUIManager *manager,
+                           GtkUIManager *ui_manager,
                            guint merge_id)
 {
 	GHashTable *hash_table;
@@ -90,15 +90,16 @@ plugin_ui_registry_insert (EPluginUIHook *hook,
 	}
 
 	g_object_weak_ref (
-		G_OBJECT (manager), (GWeakNotify)
+		G_OBJECT (ui_manager), (GWeakNotify)
 		plugin_ui_registry_remove, hook);
 
-	g_hash_table_insert (hash_table, manager, GUINT_TO_POINTER (merge_id));
+	g_hash_table_insert (
+		hash_table, ui_manager, GUINT_TO_POINTER (merge_id));
 }
 
 /* Helper for plugin_ui_hook_merge_ui() */
 static void
-plugin_ui_hook_merge_foreach (GtkUIManager *manager,
+plugin_ui_hook_merge_foreach (GtkUIManager *ui_manager,
                               const gchar *ui_definition,
                               GHashTable *hash_table)
 {
@@ -107,15 +108,16 @@ plugin_ui_hook_merge_foreach (GtkUIManager *manager,
 
 	/* Merge the UI definition into the manager. */
 	merge_id = gtk_ui_manager_add_ui_from_string (
-		manager, ui_definition, -1, &error);
-	gtk_ui_manager_ensure_update (manager);
+		ui_manager, ui_definition, -1, &error);
+	gtk_ui_manager_ensure_update (ui_manager);
 	if (error != NULL) {
 		g_warning ("%s", error->message);
 		g_error_free (error);
 	}
 
 	/* Merge ID will be 0 on error, which is what we want. */
-	g_hash_table_insert (hash_table, manager, GUINT_TO_POINTER (merge_id));
+	g_hash_table_insert (
+		hash_table, ui_manager, GUINT_TO_POINTER (merge_id));
 }
 
 static void
@@ -137,14 +139,14 @@ plugin_ui_hook_merge_ui (EPluginUIHook *hook)
 	intermediate = g_hash_table_new (g_direct_hash, g_direct_equal);
 
 	while (keys != NULL) {
-		GtkUIManager *manager = keys->data;
+		GtkUIManager *ui_manager = keys->data;
 		gchar *ui_definition;
 
 		ui_definition = g_hash_table_lookup (
 			hook->priv->ui_definitions,
-			e_plugin_ui_get_manager_id (manager));
+			e_plugin_ui_get_manager_id (ui_manager));
 
-		g_hash_table_insert (intermediate, manager, ui_definition);
+		g_hash_table_insert (intermediate, ui_manager, ui_definition);
 
 		keys = g_list_delete_link (keys, keys);
 	}
@@ -162,16 +164,16 @@ plugin_ui_hook_merge_ui (EPluginUIHook *hook)
 
 /* Helper for plugin_ui_hook_unmerge_ui() */
 static void
-plugin_ui_hook_unmerge_foreach (GtkUIManager *manager,
+plugin_ui_hook_unmerge_foreach (GtkUIManager *ui_manager,
                                 gpointer value,
                                 GHashTable *hash_table)
 {
 	guint merge_id;
 
 	merge_id = GPOINTER_TO_UINT (value);
-	gtk_ui_manager_remove_ui (manager, merge_id);
+	gtk_ui_manager_remove_ui (ui_manager, merge_id);
 
-	g_hash_table_insert (hash_table, manager, GUINT_TO_POINTER (0));
+	g_hash_table_insert (hash_table, ui_manager, GUINT_TO_POINTER (0));
 }
 
 static void
@@ -195,7 +197,7 @@ plugin_ui_hook_unmerge_ui (EPluginUIHook *hook)
 
 static void
 plugin_ui_hook_register_manager (EPluginUIHook *hook,
-                                 GtkUIManager *manager,
+                                 GtkUIManager *ui_manager,
                                  const gchar *ui_definition,
                                  gpointer user_data)
 {
@@ -210,7 +212,7 @@ plugin_ui_hook_register_manager (EPluginUIHook *hook,
 	 * function (if it defined one).  The plugin should install whatever
 	 * GtkActions and GtkActionGroups are neccessary to implement the
 	 * action names in its UI definition. */
-	if (func != NULL && !func (manager, user_data))
+	if (func != NULL && !func (ui_manager, user_data))
 		return;
 
 	if (plugin->enabled) {
@@ -218,8 +220,8 @@ plugin_ui_hook_register_manager (EPluginUIHook *hook,
 
 		/* Merge the UI definition into the manager. */
 		merge_id = gtk_ui_manager_add_ui_from_string (
-			manager, ui_definition, -1, &error);
-		gtk_ui_manager_ensure_update (manager);
+			ui_manager, ui_definition, -1, &error);
+		gtk_ui_manager_ensure_update (ui_manager);
 		if (error != NULL) {
 			g_warning ("%s", error->message);
 			g_error_free (error);
@@ -227,7 +229,7 @@ plugin_ui_hook_register_manager (EPluginUIHook *hook,
 	}
 
 	/* Save merge ID's for later use. */
-	plugin_ui_registry_insert (hook, manager, merge_id);
+	plugin_ui_registry_insert (hook, ui_manager, merge_id);
 }
 
 static void
@@ -368,16 +370,16 @@ e_plugin_ui_hook_get_type (void)
 
 void
 e_plugin_ui_register_manager (const gchar *id,
-                              GtkUIManager *manager,
+                              GtkUIManager *ui_manager,
                               gpointer user_data)
 {
 	const gchar *key = E_PLUGIN_UI_MANAGER_ID_KEY;
 	GSList *plugin_list;
 
 	g_return_if_fail (id != NULL);
-	g_return_if_fail (GTK_IS_UI_MANAGER (manager));
+	g_return_if_fail (GTK_IS_UI_MANAGER (ui_manager));
 
-	g_object_set_data (G_OBJECT (manager), key, (gpointer) id);
+	g_object_set_data (G_OBJECT (ui_manager), key, (gpointer) id);
 
 	/* Loop over all installed plugins. */
 	plugin_list = e_plugin_list_plugins ();
@@ -402,7 +404,7 @@ e_plugin_ui_register_manager (const gchar *id,
 
 			/* Register the manager with the hook. */
 			plugin_ui_hook_register_manager (
-				hook, manager, ui_definition, user_data);
+				hook, ui_manager, ui_definition, user_data);
 		}
 
 		plugin_list = g_slist_next (plugin_list);
@@ -410,11 +412,11 @@ e_plugin_ui_register_manager (const gchar *id,
 }
 
 const gchar *
-e_plugin_ui_get_manager_id (GtkUIManager *manager)
+e_plugin_ui_get_manager_id (GtkUIManager *ui_manager)
 {
 	const gchar *key = E_PLUGIN_UI_MANAGER_ID_KEY;
 
-	g_return_val_if_fail (GTK_IS_UI_MANAGER (manager), NULL);
+	g_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
 
-	return g_object_get_data (G_OBJECT (manager), key);
+	return g_object_get_data (G_OBJECT (ui_manager), key);
 }
diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h
index 00e6ed5fcf..b8e795c4c4 100644
--- a/e-util/e-plugin-ui.h
+++ b/e-util/e-plugin-ui.h
@@ -57,15 +57,15 @@ struct _EPluginUIHookClass {
 
 /* Plugins with "org.gnome.evolution.ui" hooks should define a
  * function named e_plugin_ui_init() having this signature. */
-typedef gboolean	(*EPluginUIInitFunc)	(GtkUIManager *manager,
+typedef gboolean	(*EPluginUIInitFunc)	(GtkUIManager *ui_manager,
 						 gpointer user_data);
 
 GType		e_plugin_ui_hook_get_type	(void);
 
 void		e_plugin_ui_register_manager	(const gchar *id,
-						 GtkUIManager *manager,
+						 GtkUIManager *ui_manager,
 						 gpointer user_data);
-const gchar *	e_plugin_ui_get_manager_id	(GtkUIManager *manager);
+const gchar *	e_plugin_ui_get_manager_id	(GtkUIManager *ui_manager);
 
 G_END_DECLS
 
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index 912182f5ac..daee1db92c 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -327,7 +327,7 @@ static void
 signature_editor_init (ESignatureEditor *editor)
 {
 	GtkActionGroup *action_group;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkWidget *container;
 	GtkWidget *widget;
 	GtkWidget *vbox;
@@ -336,9 +336,9 @@ signature_editor_init (ESignatureEditor *editor)
 	editor->priv = E_SIGNATURE_EDITOR_GET_PRIVATE (editor);
 	vbox = GTKHTML_EDITOR (editor)->vbox;
 
-	manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (editor));
+	ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (editor));
 
-	gtk_ui_manager_add_ui_from_string (manager, ui, -1, &error);
+	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
 	handle_error (&error);
 
 	action_group = gtk_action_group_new ("signature");
@@ -347,10 +347,10 @@ signature_editor_init (ESignatureEditor *editor)
 	gtk_action_group_add_actions (
 		action_group, entries,
 		G_N_ELEMENTS (entries), editor);
-	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
 	editor->priv->action_group = g_object_ref (action_group);
 
-	gtk_ui_manager_ensure_update (manager);
+	gtk_ui_manager_ensure_update (ui_manager);
 
 	gtk_window_set_title (GTK_WINDOW (editor), _("Edit Signature"));
 
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 994af730b6..fe1a73febb 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -83,7 +83,7 @@ static gint epech_check_existing_composer_window(gconstpointer a, gconstpointer
 static void commit_changes (ConfigData *cd);
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl);
-gboolean e_plugin_ui_init(GtkUIManager *manager, EMsgComposer *composer);
+gboolean e_plugin_ui_init(GtkUIManager *ui_manager, EMsgComposer *composer);
 GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 
 int
@@ -589,7 +589,7 @@ static GtkActionEntry entries[] = {
 };
 
 gboolean
-e_plugin_ui_init (GtkUIManager *manager,
+e_plugin_ui_init (GtkUIManager *ui_manager,
                   EMsgComposer *composer)
 {
 	GtkhtmlEditor *editor;
diff --git a/plugins/face/face.c b/plugins/face/face.c
index ba683e91aa..ca3af16ab4 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -34,7 +34,7 @@
 
 #define d(x)
 
-gboolean	e_plugin_ui_init		(GtkUIManager *manager,
+gboolean	e_plugin_ui_init		(GtkUIManager *ui_manager,
 						 EMsgComposer *composer);
 
 static void
@@ -130,7 +130,7 @@ static GtkActionEntry entries[] = {
 };
 
 gboolean
-e_plugin_ui_init (GtkUIManager *manager,
+e_plugin_ui_init (GtkUIManager *ui_manager,
                   EMsgComposer *composer)
 {
 	GtkhtmlEditor *editor;
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 8996c7f8c1..eae87721c4 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -88,7 +88,7 @@ void org_gnome_templates_popup	(EPlugin *ep, EMPopupTargetSelect *t);
 
 GtkWidget *e_plugin_lib_get_configure_widget	(EPlugin *epl);
 
-gboolean e_plugin_ui_init	(GtkUIManager *manager, EMsgComposer *composer);
+gboolean e_plugin_ui_init	(GtkUIManager *ui_manager, EMsgComposer *composer);
 
 
 /* Thanks to attachment reminder plugin for this*/
@@ -715,7 +715,7 @@ static GtkActionEntry entries[] = {
 };
 
 gboolean
-e_plugin_ui_init (GtkUIManager *manager,
+e_plugin_ui_init (GtkUIManager *ui_manager,
                   EMsgComposer *composer)
 {
 	GtkhtmlEditor *editor;