More code cleanup.

25 files changed, 86 insertions, 86 deletions

diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c
index 97360a7552..ea76200c48 100644
--- a/e-util/e-config-listener.c
+++ b/e-util/e-config-listener.c
@@ -35,7 +35,7 @@ typedef struct {
 	GConfValueType type;
 	union {
 		gboolean v_bool;
-		float v_float;
+		gfloat v_float;
 		long v_long;
 		gchar *v_str;
 	} value;
@@ -230,7 +230,7 @@ add_key (EConfigListener *cl, const gchar *key, GConfValueType type,
 		memcpy (&kd->value.v_bool, value, sizeof (gboolean));
 		break;
 	case GCONF_VALUE_FLOAT :
-		memcpy (&kd->value.v_float, value, sizeof (float));
+		memcpy (&kd->value.v_float, value, sizeof (gfloat));
 		break;
 	case GCONF_VALUE_INT :
 		memcpy (&kd->value.v_long, value, sizeof (long));
@@ -305,20 +305,20 @@ e_config_listener_get_boolean_with_default (EConfigListener *cl,
 	return value;
 }
 
-float
+gfloat
 e_config_listener_get_float (EConfigListener *cl, const gchar *key)
 {
 	return e_config_listener_get_float_with_default (cl, key, 0.0, NULL);
 }
 
-float
+gfloat
 e_config_listener_get_float_with_default (EConfigListener *cl,
 					  const gchar *key,
-					  float def,
+					  gfloat def,
 					  gboolean *used_default)
 {
 	GConfValue *conf_value;
-	float value;
+	gfloat value;
 	KeyData *kd;
 
 	g_return_val_if_fail (E_IS_CONFIG_LISTENER (cl), -1);
@@ -355,13 +355,13 @@ e_config_listener_get_float_with_default (EConfigListener *cl,
 	return value;
 }
 
-long
+glong
 e_config_listener_get_long (EConfigListener *cl, const gchar *key)
 {
 	return e_config_listener_get_long_with_default (cl, key, 0, NULL);
 }
 
-long
+glong
 e_config_listener_get_long_with_default (EConfigListener *cl,
 					 const gchar *key,
 					 long def,
@@ -481,7 +481,7 @@ e_config_listener_set_boolean (EConfigListener *cl, const gchar *key, gboolean v
 }
 
 void
-e_config_listener_set_float (EConfigListener *cl, const gchar *key, float value)
+e_config_listener_set_float (EConfigListener *cl, const gchar *key, gfloat value)
 {
 	KeyData *kd;
 	GError *err = NULL;
diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h
index 47eb9c2e80..35aca2b97f 100644
--- a/e-util/e-config-listener.h
+++ b/e-util/e-config-listener.h
@@ -56,13 +56,13 @@ gboolean              e_config_listener_get_boolean_with_default (EConfigListene
 								  const gchar *key,
 								  gboolean def,
 								  gboolean *used_default);
-float                 e_config_listener_get_float (EConfigListener *cl, const gchar *key);
-float                 e_config_listener_get_float_with_default (EConfigListener *cl,
+gfloat                 e_config_listener_get_float (EConfigListener *cl, const gchar *key);
+gfloat                 e_config_listener_get_float_with_default (EConfigListener *cl,
 								const gchar *key,
-								float def,
+								gfloat def,
 								gboolean *used_default);
-long                  e_config_listener_get_long (EConfigListener *cl, const gchar *key);
-long                  e_config_listener_get_long_with_default (EConfigListener *cl,
+glong                  e_config_listener_get_long (EConfigListener *cl, const gchar *key);
+glong                  e_config_listener_get_long_with_default (EConfigListener *cl,
 							       const gchar *key,
 							       long def,
 							       gboolean *used_default);
@@ -76,7 +76,7 @@ void                  e_config_listener_set_boolean (EConfigListener *cl,
 						     gboolean value);
 void                  e_config_listener_set_float (EConfigListener *cl,
 						   const gchar *key,
-						   float value);
+						   gfloat value);
 void                  e_config_listener_set_long (EConfigListener *cl,
 						  const gchar *key,
 						  long value);
diff --git a/e-util/e-config.c b/e-util/e-config.c
index b51ca463a5..9336e778cd 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -300,7 +300,7 @@ ec_add_static_items(EConfig *ec)
 	}
 }
 
-static int
+static gint
 ep_cmp(gconstpointer ap, gconstpointer bp)
 {
 	struct _widget_node *a = *((gpointer *)ap);
@@ -1193,7 +1193,7 @@ e_config_class_remove_factory(EConfigClass *klass, EConfigFactory *f)
  * Allocate a new config target suitable for this class.  Implementing
  * classes will define the actual content of the target.
  **/
-gpointer e_config_target_new(EConfig *ep, gint type, size_t size)
+gpointer e_config_target_new(EConfig *ep, gint type, gsize size)
 {
 	EConfigTarget *t;
 
@@ -1438,7 +1438,7 @@ error:
 	return NULL;
 }
 
-static int
+static gint
 emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
diff --git a/e-util/e-config.h b/e-util/e-config.h
index afb897477f..55bd6abc8b 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -253,7 +253,7 @@ const gchar *e_config_page_prev(EConfig *ec, const gchar *pageid);
 void e_config_abort(EConfig *);
 void e_config_commit(EConfig *);
 
-gpointer e_config_target_new(EConfig *, gint type, size_t size);
+gpointer e_config_target_new(EConfig *, gint type, gsize size);
 void e_config_target_free(EConfig *, gpointer );
 
 /* ********************************************************************** */
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index ae53a17ca7..afa680d11b 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -79,7 +79,7 @@ get_dialog_hooks (GtkWidget *dialog)
 /* Converts an mapped value to the appropriate index in an item group.  The
  * values for the items are provided as a -1-terminated array.
  */
-static int
+static gint
 value_to_index (const gint *value_map, gint value)
 {
 	gint i;
@@ -94,7 +94,7 @@ value_to_index (const gint *value_map, gint value)
 /* Converts an index in an item group to the appropriate mapped value.  See the
  * function above.
  */
-static int
+static gint
 index_to_value (const gint *value_map, gint index)
 {
 	gint i;
@@ -408,7 +408,7 @@ e_dialog_spin_set (GtkWidget *widget, double value)
  *
  * Return value: Numeric value.
  **/
-double
+gdouble
 e_dialog_spin_get_double (GtkWidget *widget)
 {
 	GtkAdjustment *adj;
@@ -437,7 +437,7 @@ e_dialog_spin_get_int (GtkWidget *widget)
 	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1);
 
 	value = e_dialog_spin_get_double (widget);
-	return (int) floor (value);
+	return (gint) floor (value);
 }
 
 /**
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
index b40edc832a..ff4a9e0d0d 100644
--- a/e-util/e-dialog-widgets.h
+++ b/e-util/e-dialog-widgets.h
@@ -40,7 +40,7 @@ void e_dialog_toggle_set (GtkWidget *widget, gboolean value);
 gboolean e_dialog_toggle_get (GtkWidget *widget);
 
 void e_dialog_spin_set (GtkWidget *widget, double value);
-double e_dialog_spin_get_double (GtkWidget *widget);
+gdouble e_dialog_spin_get_double (GtkWidget *widget);
 gint e_dialog_spin_get_int (GtkWidget *widget);
 
 void e_dialog_combo_box_set (GtkWidget *widget, gint value, const gint *value_map);
diff --git a/e-util/e-error.c b/e-util/e-error.c
index c35e8b2dde..4215bfe7de 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -98,7 +98,7 @@ static struct {
 	{ "GTK_RESPONSE_HELP", GTK_RESPONSE_HELP },
 };
 
-static int
+static gint
 map_response(const gchar *name)
 {
 	gint i;
@@ -121,7 +121,7 @@ static struct {
 	{ "error", GTK_STOCK_DIALOG_ERROR, N_("Evolution Error") },
 };
 
-static int
+static gint
 map_type(const gchar *name)
 {
 	gint i;
diff --git a/e-util/e-event.c b/e-util/e-event.c
index d449030c0b..a94c238035 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -218,7 +218,7 @@ e_event_remove_items(EEvent *emp, gpointer handle)
 	}
 }
 
-static int
+static gint
 ee_cmp(gconstpointer ap, gconstpointer bp)
 {
 	gint a = ((struct _event_info **)ap)[0]->item->priority;
@@ -306,7 +306,7 @@ e_event_emit(EEvent *emp, const gchar *id, EEventTarget *target)
  * the implementation to define the available target types and their
  * structure.
  **/
-gpointer e_event_target_new(EEvent *ep, gint type, size_t size)
+gpointer e_event_target_new(EEvent *ep, gint type, gsize size)
 {
 	EEventTarget *t;
 
@@ -455,7 +455,7 @@ error:
 	return NULL;
 }
 
-static int
+static gint
 emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
diff --git a/e-util/e-event.h b/e-util/e-event.h
index 5ae3b61d1b..3ea5c8202b 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -163,7 +163,7 @@ void e_event_remove_items(EEvent *emp, gpointer handle);
 
 void e_event_emit(EEvent *, const gchar *id, EEventTarget *);
 
-gpointer e_event_target_new(EEvent *, gint type, size_t size);
+gpointer e_event_target_new(EEvent *, gint type, gsize size);
 void e_event_target_free(EEvent *, gpointer );
 
 /* ********************************************************************** */
diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c
index 335fad4aff..c5426f8c81 100644
--- a/e-util/e-fsutils.c
+++ b/e-util/e-fsutils.c
@@ -60,7 +60,7 @@
  * Return value: The number of 1024 byte blocks used by the
  * filesystem.
  **/
-long e_fsutils_usage(const gchar *inpath)
+glong e_fsutils_usage(const gchar *inpath)
 {
 	GDir *dir;
 	const gchar *d;
@@ -128,7 +128,7 @@ fail:
  * number of disk blocks, expressed as system-independent, 1024 byte
  * blocks.
  **/
-long
+glong
 e_fsutils_avail(const gchar *path)
 {
 #if defined(HAVE_STATVFS)
diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h
index d675b39e80..6143e487ab 100644
--- a/e-util/e-fsutils.h
+++ b/e-util/e-fsutils.h
@@ -27,8 +27,8 @@
 
 G_BEGIN_DECLS
 
-long e_fsutils_usage(const gchar *path);
-long e_fsutils_avail(const gchar *path);
+glong e_fsutils_usage(const gchar *path);
+glong e_fsutils_avail(const gchar *path);
 
 G_END_DECLS
 
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 84c8a24605..4e2cdc3302 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -337,7 +337,7 @@ void e_import_class_remove_importer(EImportClass *klass, EImportImporter *f)
  * Allocate a new import target suitable for this class.  Implementing
  * classes will define the actual content of the target.
  **/
-gpointer e_import_target_new(EImport *ep, gint type, size_t size)
+gpointer e_import_target_new(EImport *ep, gint type, gsize size)
 {
 	EImportTarget *t;
 
@@ -520,7 +520,7 @@ error:
 	return NULL;
 }
 
-static int
+static gint
 emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 760544667d..5e95d6ae6b 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -188,7 +188,7 @@ struct _GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImpo
 void e_import_status(EImport *, EImportTarget *, const gchar *what, gint pc);
 void e_import_complete(EImport *, EImportTarget *);
 
-gpointer e_import_target_new(EImport *ep, gint type, size_t size);
+gpointer e_import_target_new(EImport *ep, gint type, gsize size);
 void e_import_target_free(EImport *ep, gpointer o);
 
 EImportTargetURI *e_import_target_new_uri(EImport *ei, const gchar *suri, const gchar *duri);
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index 6c391efb3b..07571d229a 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -266,7 +266,7 @@ e_logger_get_logs (ELogger *logger,
 
 	while (!feof (fp)) {
 		gchar *tmp;
-		size_t len;
+		gsize len;
 
 		tmp = fgets (buf, sizeof (buf), fp);
 		if (!tmp)
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index 4687e97fb1..76c41b62f5 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -366,13 +366,13 @@ void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, gint act)
 		for (mw = (struct _menu_node *)p->menus.head;mw->next;mw=mw->next) {
 			struct _item_node *inode;
 
-			for (l = mw->uis; l ; l = g_slist_next(l)) {
+			for (l = mw->uis; l; l = g_slist_next(l)) {
 				EMenuUIFile *ui = l->data;
 
 				bonobo_ui_util_set_ui(uic, ui->appdir, ui->filename, ui->appname, NULL);
 			}
 
-			for (l = mw->pixmaps; l ; l = g_slist_next(l)) {
+			for (l = mw->pixmaps; l; l = g_slist_next(l)) {
 				EMenuPixmap *pm = l->data;
 
 				if (pm->pixmap)
@@ -538,7 +538,7 @@ e_menu_class_remove_factory(EMenuClass *klass, EMenuFactory *f)
  * to specify the actual target size, which may vary depending on the
  * implementing class.
  **/
-gpointer e_menu_target_new(EMenu *ep, gint type, size_t size)
+gpointer e_menu_target_new(EMenu *ep, gint type, gsize size)
 {
 	EMenuTarget *t;
 
@@ -821,7 +821,7 @@ error:
 	return NULL;
 }
 
-static int
+static gint
 emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
diff --git a/e-util/e-menu.h b/e-util/e-menu.h
index 42e03572ae..d0a8e9939d 100644
--- a/e-util/e-menu.h
+++ b/e-util/e-menu.h
@@ -222,7 +222,7 @@ void e_menu_remove_items(EMenu *emp, gpointer handle);
 void e_menu_activate(EMenu *, struct _BonoboUIComponent *uic, gint act);
 void e_menu_update_target(EMenu *, gpointer );
 
-gpointer e_menu_target_new(EMenu *, gint type, size_t size);
+gpointer e_menu_target_new(EMenu *, gint type, gsize size);
 void e_menu_target_free(EMenu *, gpointer );
 
 /* ********************************************************************** */
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 0044b2e085..0e4cc6c7f3 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -50,13 +50,13 @@
 /* dont scan more often than this */
 #define TEMP_SCAN (60)
 
-static int
+static gint
 expire_dir_rec(const gchar *base, time_t now)
 {
 	GDir *dir;
 	const gchar *d;
 	GString *path;
-	size_t len;
+	gsize len;
 	struct stat st;
 	gint count = 0;
 
@@ -120,7 +120,7 @@ get_dir (gboolean make)
 	g_free(tmpdir);
 #else
 	path = g_string_new("/tmp/evolution-");
-	g_string_append_printf (path, "%d", (int) getuid ());
+	g_string_append_printf (path, "%d", (gint) getuid ());
 	if (make) {
 		gint ret;
 
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 61cf2c5e9f..3b3d5d215d 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -131,7 +131,7 @@ ep_set_enabled (const gchar *id, gint state)
 		GCONF_VALUE_STRING, ep_disabled, NULL);
 }
 
-static int
+static gint
 ep_construct (EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
@@ -420,7 +420,7 @@ ep_load_plugin(xmlNodePtr root, struct _plugin_doc *pdoc)
 	return ep;
 }
 
-static int
+static gint
 ep_load(const gchar *filename, gint load_level)
 {
 	xmlDocPtr doc;
@@ -445,7 +445,7 @@ ep_load(const gchar *filename, gint load_level)
 	pdoc->doc = doc;
 	pdoc->filename = g_strdup(filename);
 
-	for (root = root->children; root ; root = root->next) {
+	for (root = root->children; root; root = root->next) {
 		if (strcmp((gchar *)root->name, "e-plugin") == 0) {
 			gchar *plugin_load_level, *is_system_plugin;
 
@@ -503,7 +503,7 @@ ep_load(const gchar *filename, gint load_level)
 /* This loads a hook that was pending on a given plugin but the type wasn't registered yet */
 /* This works in conjunction with ep_construct and e_plugin_hook_register_type to make sure
    everything works nicely together.  Apparently. */
-static int
+static gint
 ep_load_pending(EPlugin *ep, EPluginHookClass *type)
 {
 	gint res = 0;
@@ -988,7 +988,7 @@ static gpointer epl_parent_class;
 
 static GList *missing_symbols = NULL;
 
-static int
+static gint
 epl_loadmodule(EPlugin *ep, gboolean fatal)
 {
 	EPluginLib *epl = E_PLUGIN_LIB (ep);
@@ -1070,7 +1070,7 @@ epl_get_symbol(EPlugin *ep, const gchar *name)
 	return symbol;
 }
 
-static int
+static gint
 epl_construct(EPlugin *ep, xmlNodePtr root)
 {
 	EPluginLib *epl = E_PLUGIN_LIB (ep);
@@ -1234,7 +1234,7 @@ e_plugin_lib_get_type (void)
 
 static gpointer eph_parent_class;
 
-static int
+static gint
 eph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	eph->plugin = ep;
@@ -1484,7 +1484,7 @@ e_plugin_hook_id(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const
 
 static gpointer epth_parent_class;
 
-static int
+static gint
 epth_load_plugin(gpointer d)
 {
 	EPluginHook *eph = d;
@@ -1500,7 +1500,7 @@ epth_load_plugin(gpointer d)
 	return FALSE;
 }
 
-static int
+static gint
 epth_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	EPluginTypeHook *epth = E_PLUGIN_TYPE_HOOK (eph);
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index 9bb63748dd..4cbe221ea8 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -263,7 +263,7 @@ ep_add_static_items(EPopup *emp)
 	}
 }
 
-static int
+static gint
 ep_cmp(gconstpointer ap, gconstpointer bp)
 {
 	struct _item_node *a = *((gpointer *)ap);
@@ -648,7 +648,7 @@ e_popup_class_remove_factory(EPopupClass *klass, EPopupFactory *f)
  *
  * Allocate a new popup target suitable for this popup type.
  **/
-gpointer e_popup_target_new(EPopup *ep, gint type, size_t size)
+gpointer e_popup_target_new(EPopup *ep, gint type, gsize size)
 {
 	EPopupTarget *t;
 
@@ -853,7 +853,7 @@ error:
 	return NULL;
 }
 
-static int
+static gint
 emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index 0f430af801..8779ce8dd9 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -213,7 +213,7 @@ void e_popup_add_static_items(EPopup *emp, EPopupTarget *target);
 struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask);
 struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask);
 
-gpointer e_popup_target_new(EPopup *, gint type, size_t size);
+gpointer e_popup_target_new(EPopup *, gint type, gsize size);
 void e_popup_target_free(EPopup *, gpointer );
 
 /* ********************************************************************** */
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 02f9bc2bfc..b3b4c4a2f2 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -45,7 +45,7 @@ static gboolean esa_needs_sorting             (ESorter *esa);
 
 #define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL)
 
-static int
+static gint
 esort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
 	ESorterArray *esa = user_data;
@@ -83,7 +83,7 @@ esa_sort(ESorterArray *esa)
 
 	if (esa->compare)
 		g_qsort_with_data (
-			esa->sorted, rows, sizeof(int),
+			esa->sorted, rows, sizeof(gint),
 			esort_callback, esa);
 }
 
@@ -204,9 +204,9 @@ e_sorter_array_append  (ESorterArray *esa, gint count)
 		esa->sorted = g_renew(int, esa->sorted, esa->rows + count);
 		for (i = 0; i < count; i++) {
 			gint value = esa->rows;
-			size_t pos;
-			e_bsearch (&value, esa->sorted, esa->rows, sizeof (int), esort_callback, esa, &pos, NULL);
-			memmove (esa->sorted + pos + 1, esa->sorted + pos, sizeof (int) * (esa->rows - pos));
+			gsize pos;
+			e_bsearch (&value, esa->sorted, esa->rows, sizeof (gint), esort_callback, esa, &pos, NULL);
+			memmove (esa->sorted + pos + 1, esa->sorted + pos, sizeof (gint) * (esa->rows - pos));
 			esa->sorted[pos] = value;
 			esa->rows ++;
 		}
@@ -238,11 +238,11 @@ e_sorter_array_class_init (ESorterArrayClass *klass)
 {
 	ESorterClass *sorter_class = E_SORTER_CLASS(klass);
 
-	sorter_class->model_to_sorted           = esa_model_to_sorted           ;
-	sorter_class->sorted_to_model           = esa_sorted_to_model           ;
-	sorter_class->get_model_to_sorted_array = esa_get_model_to_sorted_array ;
-	sorter_class->get_sorted_to_model_array = esa_get_sorted_to_model_array ;
-	sorter_class->needs_sorting             = esa_needs_sorting             ;
+	sorter_class->model_to_sorted           = esa_model_to_sorted;
+	sorter_class->sorted_to_model           = esa_sorted_to_model;
+	sorter_class->get_model_to_sorted_array = esa_get_model_to_sorted_array;
+	sorter_class->get_sorted_to_model_array = esa_get_sorted_to_model_array;
+	sorter_class->needs_sorting             = esa_needs_sorting;
 }
 
 static void
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index f44019165d..8f44c0c2a2 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -435,11 +435,11 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 						key.keyval -= 'A' - 'a';
 
 					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
-						command.position = control_keys[(int) (key.keyval - 'a')].position;
-						if (control_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
-							command.action = control_keys[(int) (key.keyval - 'a')].action;
-						command.value = control_keys[(int) (key.keyval - 'a')].value;
-						command.string = control_keys[(int) (key.keyval - 'a')].string;
+						command.position = control_keys[(gint) (key.keyval - 'a')].position;
+						if (control_keys[(gint) (key.keyval - 'a')].action != E_TEP_MOVE)
+							command.action = control_keys[(gint) (key.keyval - 'a')].action;
+						command.value = control_keys[(gint) (key.keyval - 'a')].value;
+						command.string = control_keys[(gint) (key.keyval - 'a')].string;
 					}
 
 					if (key.keyval == ' ') {
@@ -461,11 +461,11 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 						key.keyval -= 'A' - 'a';
 
 					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
-						command.position = alt_keys[(int) (key.keyval - 'a')].position;
-						if (alt_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
-							command.action = alt_keys[(int) (key.keyval - 'a')].action;
-						command.value = alt_keys[(int) (key.keyval - 'a')].value;
-						command.string = alt_keys[(int) (key.keyval - 'a')].string;
+						command.position = alt_keys[(gint) (key.keyval - 'a')].position;
+						if (alt_keys[(gint) (key.keyval - 'a')].action != E_TEP_MOVE)
+							command.action = alt_keys[(gint) (key.keyval - 'a')].action;
+						command.value = alt_keys[(gint) (key.keyval - 'a')].value;
+						command.string = alt_keys[(gint) (key.keyval - 'a')].string;
 					}
 				} else if (!(key.state & GDK_MOD1_MASK) && !(key.state & GDK_CONTROL_MASK) && key.length > 0) {
 					if (key.keyval >= GDK_KP_0 && key.keyval <= GDK_KP_9) {
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index f1fed4dfab..fb815ff94f 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -239,7 +239,7 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
 {
 	gchar *new, *ob;
 	const gchar *ib;
-	size_t ibl, obl;
+	gsize ibl, obl;
 
 	if (!string) return NULL;
 
@@ -297,7 +297,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
 {
 	gchar *new, *ob;
 	const gchar *ib;
-	size_t ibl, obl;
+	gsize ibl, obl;
 
 	if (!string) return NULL;
 
@@ -601,7 +601,7 @@ e_utf8_xml1_encode (const gchar *text)
 gint
 e_unichar_to_utf8 (gint c, gchar *outbuf)
 {
-  size_t len = 0;
+  gsize len = 0;
   gint first;
   gint i;
 
@@ -1962,7 +1962,7 @@ e_canonical_decomposition (gunichar ch, gunichar * buf)
 	      /* Found it.  */
 	      gint i;
 	      /* We store as a double-nul terminated string.  */
-	      for (len = 0; (e_decomp_table[half].expansion[len] || e_decomp_table[half].expansion[len + 1]); len += 2) ;
+	      for (len = 0; (e_decomp_table[half].expansion[len] || e_decomp_table[half].expansion[len + 1]); len += 2);
 
 	      /* We've counted twice as many bytes as there are
 		 characters.  */
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 6e6ca79e79..0eaf8c39a4 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1472,7 +1472,7 @@ e_util_read_file (const gchar *filename, gboolean filename_is_uri, gchar **buffe
 		gchar *buff;
 
 		sz = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
-		buff = g_malloc (sizeof (char) * sz);
+		buff = g_malloc (sizeof (gchar) * sz);
 
 		if (buff) {
 			GInputStream *stream;
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 9630bbf916..4734790e9d 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -321,11 +321,11 @@ prop_binding_sync_prop_to_pref (PropBinding *binding)
         case G_TYPE_DOUBLE:
                 gconf_value = gconf_value_new (GCONF_VALUE_FLOAT);
 #ifdef HAVE_CORBA_GCONF
-                /* FIXME we cast to a float explicitly as CORBA GConf
+                /* FIXME we cast to a gfloat explicitly as CORBA GConf
                  * uses doubles in its API, but treats them as floats
                  * when transporting them over CORBA. See #322837 */
                 gconf_value_set_float (gconf_value,
-                                       (float) g_value_get_double (&value));
+                                       (gfloat) g_value_get_double (&value));
 #else
                 gconf_value_set_float (gconf_value,
                                        g_value_get_double (&value));