Use consistent variable names for GtkUIManager

4 files changed, 29 insertions, 29 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);