aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/email-custom-header/email-custom-header.c10
-rw-r--r--plugins/face/face.c4
-rw-r--r--plugins/mark-all-read/mark-all-read.c4
-rw-r--r--plugins/plugin-manager/plugin-manager.c4
-rw-r--r--plugins/templates/templates.c4
5 files changed, 13 insertions, 13 deletions
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;