aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/dialogs
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:49:45 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:49:45 +0800
commitdc7efb1311d23c32a76a9a8092f734223ce3207e (patch)
treed6fb1ed2382b8958b63105d99377fc63b103e1b8 /calendar/gui/dialogs
parente1b2b34b20b5ca3dc3cdd3bd02510735f3657db7 (diff)
downloadgsoc2013-evolution-dc7efb1311d23c32a76a9a8092f734223ce3207e.tar.gz
gsoc2013-evolution-dc7efb1311d23c32a76a9a8092f734223ce3207e.tar.zst
gsoc2013-evolution-dc7efb1311d23c32a76a9a8092f734223ce3207e.zip
Use consistent variable names for GtkUIManager
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r--calendar/gui/dialogs/comp-editor.c30
-rw-r--r--calendar/gui/dialogs/event-editor.c10
-rw-r--r--calendar/gui/dialogs/memo-editor.c10
-rw-r--r--calendar/gui/dialogs/task-editor.c10
4 files changed, 30 insertions, 30 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index e1a7a26f4d..4cf74613cf 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;
@@ -1208,7 +1208,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);
@@ -1340,9 +1340,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. */
@@ -1556,11 +1556,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 */
@@ -1571,7 +1571,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");
@@ -1589,7 +1589,7 @@ comp_editor_init (CompEditor *editor)
E_CAL_COMPONENT_CLASS_PUBLIC,
NULL, NULL); /* no callback */
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");
@@ -1599,7 +1599,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 */
@@ -1611,7 +1611,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);
@@ -1966,7 +1966,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 *
@@ -2001,14 +2001,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 812575ef4c..c39e25acd5 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -462,7 +462,7 @@ static void
event_editor_init (EventEditor *ee)
{
CompEditor *editor = COMP_EDITOR (ee);
- GtkUIManager *manager;
+ GtkUIManager *ui_manager;
GtkActionGroup *action_group;
GtkAction *action;
const gchar *id;
@@ -486,12 +486,12 @@ 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);
+ ui_manager = comp_editor_get_ui_manager (editor);
+ gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
id = "org.gnome.evolution.event-editor";
- e_plugin_ui_register_manager (manager, id, ee);
- e_plugin_ui_enable_manager (manager, id);
+ e_plugin_ui_register_manager (ui_manager, id, ee);
+ e_plugin_ui_enable_manager (ui_manager, id);
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 5e01327703..ec7ab841c9 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -133,19 +133,19 @@ static void
memo_editor_init (MemoEditor *me)
{
CompEditor *editor = COMP_EDITOR (me);
- GtkUIManager *manager;
+ GtkUIManager *ui_manager;
const gchar *id;
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);
+ ui_manager = comp_editor_get_ui_manager (editor);
+ gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
id = "org.gnome.evolution.memo-editor";
- e_plugin_ui_register_manager (manager, id, me);
- e_plugin_ui_enable_manager (manager, id);
+ e_plugin_ui_register_manager (ui_manager, id, me);
+ e_plugin_ui_enable_manager (ui_manager, id);
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 773dea4a47..b7edd0a566 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -301,7 +301,7 @@ static void
task_editor_init (TaskEditor *te)
{
CompEditor *editor = COMP_EDITOR (te);
- GtkUIManager *manager;
+ GtkUIManager *ui_manager;
GtkActionGroup *action_group;
const gchar *id;
GError *error = NULL;
@@ -344,12 +344,12 @@ 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);
+ ui_manager = comp_editor_get_ui_manager (editor);
+ gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
id = "org.gnome.evolution.task-editor";
- e_plugin_ui_register_manager (manager, id, te);
- e_plugin_ui_enable_manager (manager, id);
+ e_plugin_ui_register_manager (ui_manager, id, te);
+ e_plugin_ui_enable_manager (ui_manager, id);
if (error != NULL) {
g_critical ("%s: %s", G_STRFUNC, error->message);