From dc7efb1311d23c32a76a9a8092f734223ce3207e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 25 Apr 2009 10:49:45 -0400 Subject: Use consistent variable names for GtkUIManager --- calendar/gui/dialogs/comp-editor.c | 30 +++++------ calendar/gui/dialogs/event-editor.c | 10 ++-- calendar/gui/dialogs/memo-editor.c | 10 ++-- calendar/gui/dialogs/task-editor.c | 10 ++-- composer/e-composer-actions.c | 8 +-- composer/e-composer-private.c | 28 +++++----- composer/e-msg-composer.c | 8 +-- doc/reference/shell/tmpl/e-shell-window.sgml | 2 +- doc/reference/shell/tmpl/e-shell.sgml | 1 + e-util/e-plugin-ui.c | 63 ++++++++++++----------- e-util/e-plugin-ui.h | 8 +-- plugins/email-custom-header/email-custom-header.c | 10 ++-- plugins/face/face.c | 4 +- plugins/mark-all-read/mark-all-read.c | 4 +- plugins/plugin-manager/plugin-manager.c | 4 +- plugins/templates/templates.c | 4 +- widgets/misc/e-signature-editor.c | 10 ++-- 17 files changed, 108 insertions(+), 106 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); 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 diff --git a/doc/reference/shell/tmpl/e-shell-window.sgml b/doc/reference/shell/tmpl/e-shell-window.sgml index 7c5442ad96..f1bbeac5e7 100644 --- a/doc/reference/shell/tmpl/e-shell-window.sgml +++ b/doc/reference/shell/tmpl/e-shell-window.sgml @@ -49,7 +49,7 @@ EShellWindow @shell: -@component_id: +@safe_mode: @Returns: diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml index 5907a493a3..04935e1de6 100644 --- a/doc/reference/shell/tmpl/e-shell.sgml +++ b/doc/reference/shell/tmpl/e-shell.sgml @@ -203,6 +203,7 @@ EShell @shell: +@parent: diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c index 2528efd0fa..099efd0d65 100644 --- a/e-util/e-plugin-ui.c +++ b/e-util/e-plugin-ui.c @@ -135,18 +135,18 @@ static gpointer parent_class; static void plugin_ui_hook_unregister_manager (EPluginUIHook *hook, - GtkUIManager *manager) + GtkUIManager *ui_manager) { GHashTable *registry; /* Note: Manager may already be finalized. */ registry = hook->priv->registry; - g_hash_table_remove (registry, manager); + g_hash_table_remove (registry, ui_manager); } static void plugin_ui_hook_register_manager (EPluginUIHook *hook, - GtkUIManager *manager, + GtkUIManager *ui_manager, gpointer user_data) { EPlugin *plugin; @@ -161,28 +161,28 @@ 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; g_object_weak_ref ( - G_OBJECT (manager), (GWeakNotify) + G_OBJECT (ui_manager), (GWeakNotify) plugin_ui_hook_unregister_manager, hook); registry = hook->priv->registry; - hash_table = g_hash_table_lookup (registry, manager); + hash_table = g_hash_table_lookup (registry, ui_manager); if (hash_table == NULL) { hash_table = g_hash_table_new_full ( g_str_hash, g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) NULL); - g_hash_table_insert (registry, manager, hash_table); + g_hash_table_insert (registry, ui_manager, hash_table); } } static guint plugin_ui_hook_merge_ui (EPluginUIHook *hook, - GtkUIManager *manager, + GtkUIManager *ui_manager, const gchar *id) { GHashTable *hash_table; @@ -195,7 +195,7 @@ plugin_ui_hook_merge_ui (EPluginUIHook *hook, g_return_val_if_fail (ui_definition != NULL, 0); merge_id = gtk_ui_manager_add_ui_from_string ( - manager, ui_definition, -1, &error); + ui_manager, ui_definition, -1, &error); if (error != NULL) { g_warning ("%s", error->message); @@ -207,7 +207,7 @@ plugin_ui_hook_merge_ui (EPluginUIHook *hook, static void plugin_ui_enable_manager (EPluginUIHook *hook, - GtkUIManager *manager, + GtkUIManager *ui_manager, const gchar *id) { GHashTable *hash_table; @@ -215,7 +215,7 @@ plugin_ui_enable_manager (EPluginUIHook *hook, GList *keys; hash_table = hook->priv->registry; - hash_table = g_hash_table_lookup (hash_table, manager); + hash_table = g_hash_table_lookup (hash_table, ui_manager); if (hash_table == NULL) return; @@ -244,7 +244,8 @@ plugin_ui_enable_manager (EPluginUIHook *hook, continue; if (((EPluginHook *) hook)->plugin->enabled) - merge_id = plugin_ui_hook_merge_ui (hook, manager, id); + merge_id = plugin_ui_hook_merge_ui ( + hook, ui_manager, id); /* Merge ID will be 0 on error, which is what we want. */ data = GUINT_TO_POINTER (merge_id); @@ -254,7 +255,7 @@ plugin_ui_enable_manager (EPluginUIHook *hook, static void plugin_ui_disable_manager (EPluginUIHook *hook, - GtkUIManager *manager, + GtkUIManager *ui_manager, const gchar *id, gboolean remove) { @@ -263,7 +264,7 @@ plugin_ui_disable_manager (EPluginUIHook *hook, GList *keys; hash_table = hook->priv->registry; - hash_table = g_hash_table_lookup (hash_table, manager); + hash_table = g_hash_table_lookup (hash_table, ui_manager); if (hash_table == NULL) return; @@ -290,7 +291,7 @@ plugin_ui_disable_manager (EPluginUIHook *hook, /* Merge ID could be 0 if the plugin is disabled. */ if (merge_id > 0) - gtk_ui_manager_remove_ui (manager, merge_id); + gtk_ui_manager_remove_ui (ui_manager, merge_id); if (remove) g_hash_table_remove (hash_table, id); @@ -312,8 +313,8 @@ plugin_ui_enable_hook (EPluginUIHook *hook) g_hash_table_iter_init (&iter, hash_table); while (g_hash_table_iter_next (&iter, &key, NULL)) { - GtkUIManager *manager = key; - plugin_ui_enable_manager (hook, manager, NULL); + GtkUIManager *ui_manager = key; + plugin_ui_enable_manager (hook, ui_manager, NULL); } } @@ -330,8 +331,8 @@ plugin_ui_disable_hook (EPluginUIHook *hook) g_hash_table_iter_init (&iter, hash_table); while (g_hash_table_iter_next (&iter, &key, NULL)) { - GtkUIManager *manager = key; - plugin_ui_disable_manager (hook, manager, NULL, FALSE); + GtkUIManager *ui_manager = key; + plugin_ui_disable_manager (hook, ui_manager, NULL, FALSE); } } @@ -340,15 +341,15 @@ plugin_ui_hook_finalize (GObject *object) { EPluginUIHookPrivate *priv; GHashTableIter iter; - gpointer manager; + gpointer ui_manager; priv = E_PLUGIN_UI_HOOK_GET_PRIVATE (object); /* Remove weak reference callbacks to GtkUIManagers. */ g_hash_table_iter_init (&iter, priv->registry); - while (g_hash_table_iter_next (&iter, &manager, NULL)) + while (g_hash_table_iter_next (&iter, &ui_manager, NULL)) g_object_weak_unref ( - G_OBJECT (manager), (GWeakNotify) + G_OBJECT (ui_manager), (GWeakNotify) plugin_ui_hook_unregister_manager, object); g_hash_table_destroy (priv->ui_definitions); @@ -481,13 +482,13 @@ e_plugin_ui_hook_get_type (void) } void -e_plugin_ui_register_manager (GtkUIManager *manager, +e_plugin_ui_register_manager (GtkUIManager *ui_manager, const gchar *id, gpointer user_data) { GSList *plugin_list; - g_return_if_fail (GTK_IS_UI_MANAGER (manager)); + g_return_if_fail (GTK_IS_UI_MANAGER (ui_manager)); g_return_if_fail (id != NULL); /* Loop over all installed plugins. */ @@ -515,18 +516,18 @@ e_plugin_ui_register_manager (GtkUIManager *manager, /* Register the manager with the hook. */ plugin_ui_hook_register_manager ( - hook, manager, user_data); + hook, ui_manager, user_data); } } } void -e_plugin_ui_enable_manager (GtkUIManager *manager, +e_plugin_ui_enable_manager (GtkUIManager *ui_manager, const gchar *id) { GSList *plugin_list; - g_return_if_fail (GTK_IS_UI_MANAGER (manager)); + g_return_if_fail (GTK_IS_UI_MANAGER (ui_manager)); g_return_if_fail (id != NULL); /* Loop over all installed plugins. */ @@ -544,18 +545,18 @@ e_plugin_ui_enable_manager (GtkUIManager *manager, if (!E_IS_PLUGIN_UI_HOOK (hook)) continue; - plugin_ui_enable_manager (hook, manager, id); + plugin_ui_enable_manager (hook, ui_manager, id); } } } void -e_plugin_ui_disable_manager (GtkUIManager *manager, +e_plugin_ui_disable_manager (GtkUIManager *ui_manager, const gchar *id) { GSList *plugin_list; - g_return_if_fail (GTK_IS_UI_MANAGER (manager)); + g_return_if_fail (GTK_IS_UI_MANAGER (ui_manager)); g_return_if_fail (id != NULL); /* Loop over all installed plugins. */ @@ -573,7 +574,7 @@ e_plugin_ui_disable_manager (GtkUIManager *manager, if (!E_IS_PLUGIN_UI_HOOK (hook)) continue; - plugin_ui_disable_manager (hook, manager, id, TRUE); + plugin_ui_disable_manager (hook, ui_manager, id, TRUE); } } } diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h index d1a380d91e..74d5bdc092 100644 --- a/e-util/e-plugin-ui.h +++ b/e-util/e-plugin-ui.h @@ -57,17 +57,17 @@ 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 (GtkUIManager *manager, +void e_plugin_ui_register_manager (GtkUIManager *ui_manager, const gchar *id, gpointer user_data); -void e_plugin_ui_enable_manager (GtkUIManager *manager, +void e_plugin_ui_enable_manager (GtkUIManager *ui_manager, const gchar *id); -void e_plugin_ui_disable_manager (GtkUIManager *manager, +void e_plugin_ui_disable_manager (GtkUIManager *ui_manager, const gchar *id); G_END_DECLS diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 994af730b6..38d41f8470 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 @@ -550,13 +550,13 @@ destroy_compo_data (gpointer data) static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *composer) { - GtkUIManager *manager; + GtkUIManager *ui_manager; GtkWidget *menuitem; CustomHeaderOptionsDialog *dialog = NULL; EmailCustomHeaderWindow *new_email_custom_header_window = NULL; - manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer)); - menuitem = gtk_ui_manager_get_widget (manager, "/main-menu/insert-menu/insert-menu-top/Custom Header"); + ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer)); + menuitem = gtk_ui_manager_get_widget (ui_manager, "/main-menu/insert-menu/insert-menu-top/Custom Header"); new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); @@ -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/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index c98b33edd1..618c6b63f6 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -46,7 +46,7 @@ N_("Do you want to mark messages as read in the current folder " \ "only, or in the current folder as well as all subfolders?") -gboolean e_plugin_ui_init (GtkUIManager *manager, +gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EShellView *shell_view); static void mar_got_folder (char *uri, CamelFolder *folder, void *data); @@ -300,7 +300,7 @@ static GtkActionEntry entries[] = { }; gboolean -e_plugin_ui_init (GtkUIManager *manager, +e_plugin_ui_init (GtkUIManager *ui_manager, EShellView *shell_view) { EShellWindow *shell_window; diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 129ff0a74f..a23508d3c1 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -80,7 +80,7 @@ static GtkWidget *configure_page; static gint last_selected_page; static gulong switch_page_handler_id; -gboolean e_plugin_ui_init (GtkUIManager *manager, +gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EShellWindow *shell_window); static void @@ -433,7 +433,7 @@ static GtkActionEntry entries[] = { }; gboolean -e_plugin_ui_init (GtkUIManager *manager, +e_plugin_ui_init (GtkUIManager *ui_manager, EShellWindow *shell_window) { GtkActionGroup *action_group; 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; diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c index c7dcbdaad9..cc1e9f6c18 100644 --- a/widgets/misc/e-signature-editor.c +++ b/widgets/misc/e-signature-editor.c @@ -329,7 +329,7 @@ static void signature_editor_init (ESignatureEditor *editor) { GtkActionGroup *action_group; - GtkUIManager *manager; + GtkUIManager *ui_manager; GtkWidget *container; GtkWidget *widget; GtkWidget *vbox; @@ -338,9 +338,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"); @@ -349,10 +349,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")); -- cgit