More code cleanup.

8 files changed, 23 insertions, 23 deletions

diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 97490b45ac..6497a7bdd1 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -89,7 +89,7 @@ component_info_free (EComponentInfo *info)
 	g_free (info);
 }
 
-static int
+static gint
 component_info_compare_func (EComponentInfo *a,
 			     EComponentInfo *b)
 {
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 30318ccb0b..57ed2495b5 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -252,7 +252,7 @@ filetype_changed_cb (GtkWidget *combobox, ImportData *data)
 }
 
 #if 0
-static int
+static gint
 compare_info_name (gconstpointer data1, const void  *data2)
 {
 	const Bonobo_ServerInfo *info1 = (Bonobo_ServerInfo *)data1;
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 8b13233a9d..6e3cf1175d 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -123,7 +123,7 @@ page_free (Page *page)
 	g_free (page);
 }
 
-static int
+static gint
 compare_page_func (gconstpointer a,
 		   gconstpointer b)
 {
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index eb1f96e6d8..6e8215c63e 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -113,7 +113,7 @@ struct _EShellWindowPrivate {
 	GtkWidget *menu_hint_label;
 
 	/* The timeout for saving the window size */
-	guint      store_window_size_timer;
+	guint      store_window_gsizeimer;
 	gboolean destroyed;
 };
 
@@ -842,9 +842,9 @@ impl_dispose (GObject *object)
 		priv->ui_component = NULL;
 	}
 
-	if (priv->store_window_size_timer) {
-		g_source_remove (priv->store_window_size_timer);
-		self->priv->store_window_size_timer = 0;
+	if (priv->store_window_gsizeimer) {
+		g_source_remove (priv->store_window_gsizeimer);
+		self->priv->store_window_gsizeimer = 0;
 
 		/* There was a timer. Let us store the settings.*/
 		store_window_size (GTK_WIDGET (self));
@@ -870,11 +870,11 @@ impl_finalize (GObject *object)
 
 /* GtkWidget methods */
 static void
-e_shell_window_remove_resize_timer (EShellWindow* self)
+e_shell_window_remove_regsizeimer (EShellWindow* self)
 {
-	if (self->priv->store_window_size_timer) {
-		g_source_remove (self->priv->store_window_size_timer);
-		self->priv->store_window_size_timer = 0;
+	if (self->priv->store_window_gsizeimer) {
+		g_source_remove (self->priv->store_window_gsizeimer);
+		self->priv->store_window_gsizeimer = 0;
 	}
 }
 
@@ -892,7 +892,7 @@ impl_window_state (GtkWidget *widget, GdkEventWindowState* ev)
 	}
 
 	if ((ev->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-		e_shell_window_remove_resize_timer (E_SHELL_WINDOW (widget));
+		e_shell_window_remove_regsizeimer (E_SHELL_WINDOW (widget));
 	}
 
 	if (GTK_WIDGET_CLASS (e_shell_window_parent_class)->window_state_event) {
@@ -912,7 +912,7 @@ store_window_size (GtkWidget* widget)
 			      widget->allocation.height, NULL);
 	g_object_unref(client);
 
-	E_SHELL_WINDOW (widget)->priv->store_window_size_timer = 0;
+	E_SHELL_WINDOW (widget)->priv->store_window_gsizeimer = 0;
 	return FALSE; /* remove this timeout */
 }
 
@@ -920,11 +920,11 @@ static void
 impl_size_alloc (GtkWidget* widget, GtkAllocation* alloc)
 {
 	EShellWindow* self = E_SHELL_WINDOW (widget);
-	e_shell_window_remove_resize_timer(self);
+	e_shell_window_remove_regsizeimer(self);
 
 	if (GTK_WIDGET_REALIZED(widget) && !(gdk_window_get_state(widget->window) & GDK_WINDOW_STATE_MAXIMIZED)) {
 		/* update the size storage timer */
-		self->priv->store_window_size_timer = g_timeout_add_seconds (1, (GSourceFunc)store_window_size, self);
+		self->priv->store_window_gsizeimer = g_timeout_add_seconds (1, (GSourceFunc)store_window_size, self);
 	}
 
 	if (GTK_WIDGET_CLASS (e_shell_window_parent_class)->size_allocate) {
diff --git a/shell/e-shell.c b/shell/e-shell.c
index de4e0a88ca..9869d6e9e9 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -346,7 +346,7 @@ impl_Shell_findComponent(PortableServer_Servant servant,
 
 /* EShellWindow handling and bookkeeping.  */
 
-static int
+static gint
 window_delete_event_cb (GtkWidget *widget,
 		      GdkEventAny *ev,
 		      gpointer data)
@@ -752,7 +752,7 @@ e_shell_new (EShellStartupLineMode startup_line_mode,
 	return new;
 }
 
-static int
+static gint
 remove_dir(const gchar *root, const gchar *path)
 {
 	GDir *dir;
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 6a061ab422..8d5152966e 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -209,7 +209,7 @@ button_query_tooltip (GtkWidget  *widget,
 
 /* Layout. */
 
-static int
+static gint
 layout_buttons (ESidebar *sidebar)
 {
 	GtkAllocation *allocation = & GTK_WIDGET (sidebar)->allocation;
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index 2fe35ddb78..ce2afa3fb7 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -445,7 +445,7 @@ add_verbs (EUserCreatableItemsHandler *handler,
 
 /* Generic menu construction code */
 
-static int
+static gint
 item_types_sort_func (gconstpointer a,
 		      gconstpointer b)
 {
@@ -470,9 +470,9 @@ item_types_sort_func (gconstpointer a,
 			continue;
 		}
 
-		if (toupper ((int) *p1) < toupper ((int) *p2))
+		if (toupper ((gint) *p1) < toupper ((gint) *p2))
 			return -1;
-		else if (toupper ((int) *p1) > toupper ((int) *p2))
+		else if (toupper ((gint) *p1) > toupper ((gint) *p2))
 			return +1;
 
 		p1 ++, p2 ++;
@@ -489,7 +489,7 @@ item_types_sort_func (gconstpointer a,
 }
 
 typedef void (*EUserCreatableItemsHandlerMenuItemFunc) (EUserCreatableItemsHandler *, gpointer, MenuItem *, gboolean);
-typedef void (*EUserCreatableItemsHandlerSeparatorFunc) (EUserCreatableItemsHandler *, gpointer, int);
+typedef void (*EUserCreatableItemsHandlerSeparatorFunc) (EUserCreatableItemsHandler *, gpointer, gint);
 
 static void
 construct_menu (EUserCreatableItemsHandler *handler, gpointer menu,
diff --git a/shell/main.c b/shell/main.c
index 4032c5544e..2eb2b2a5f3 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -417,7 +417,7 @@ idle_cb (gchar **uris)
    thread. So if we have to redirect the signal if the crash happens in another
    thread.  */
 
-static void (*gnome_segv_handler) (int);
+static void (*gnome_segv_handler) (gint);
 static GStaticMutex segv_mutex = G_STATIC_MUTEX_INIT;
 static pthread_t main_thread;