More code cleanup.

249 files changed, 899 insertions, 899 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 0ae9210bc6..b338bb51ad 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -166,7 +166,7 @@ struct _EAddrConduitCfg {
  *       in UTF-8 format. A conversion must take place before calling
  *       this function (see e_pilot_utf8_to_pchar() in e-pilot-util.c)
  */
-static int
+static gint
 e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category)
 {
 	gint i, j;
@@ -964,7 +964,7 @@ is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local)
 		if (empty)
 			continue;
 
-		for ( ; priority_label[l] != -1; l++)
+		for (; priority_label[l] != -1; l++)
 			if (phonelabel == priority_label[l])
 				break;
 
@@ -1267,7 +1267,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
 				phone++;
 			}
 		}
-		for ( ; phone <= entryPhone5; phone++)
+		for (; phone <= entryPhone5; phone++)
 			local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1;
 		local->addr->showPhone = 0;
 	} else {
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index e753351755..6f62d0ab13 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -301,7 +301,7 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap)
 	return ldap_error;
 }
 
-static int
+static gint
 addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
 			    const gchar **attrs, LDAPMessage **resp)
 {
diff --git a/addressbook/gui/component/e-book-shell-migrate.c b/addressbook/gui/component/e-book-shell-migrate.c
index 4b0b61d186..fce6e0a634 100644
--- a/addressbook/gui/component/e-book-shell-migrate.c
+++ b/addressbook/gui/component/e-book-shell-migrate.c
@@ -144,7 +144,7 @@ dialog_set_progress (MigrationContext *context, double percent)
 {
 	gchar text[5];
 
-	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
+	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
 
 	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), percent);
 	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (context->progress), text);
@@ -188,7 +188,7 @@ get_source_name (ESourceGroup *group, const gchar *path)
 	gboolean conflict;
 	GString *s = g_string_new ("");
 
-	for (i = 0; p[i]; i ++) ;
+	for (i = 0; p[i]; i ++);
 
 	num_elements = i;
 	i--;
@@ -586,7 +586,7 @@ get_string_child (xmlNode *node,
 	return retval;
 }
 
-static int
+static gint
 get_integer_child (xmlNode *node,
 		   const gchar *name,
 		   gint defval)
@@ -784,7 +784,7 @@ migrate_completion_folders (MigrationContext *context)
 
 				   if the physical_uri is anything
 				   else, we strip off the args
-				   (anything after ;) before searching
+				   (anything after;) before searching
 				   for the uri. */
 
 				if (!strncmp (physical_uri, "file://", 7)) {
@@ -1023,9 +1023,9 @@ migrate_pilot_data (const gchar *old_path, const gchar *new_path)
 		     ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db")))) {
 			/* src and dest file formats are identical for both map and changelog files */
 			guchar inbuf[4096];
-			size_t nread, nwritten;
+			gsize nread, nwritten;
 			gint fd0, fd1;
-			ssize_t n;
+			gssize n;
 
 			filename = g_build_filename (old_path, dent, NULL);
 			if ((fd0 = g_open (filename, O_RDONLY | O_BINARY, 0)) == -1) {
diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h
index 630e12e4f6..996bf370a8 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/addressbook/gui/component/openldap-extract.h
@@ -147,7 +147,7 @@ struct token {
 	gchar *sval;
 };
 
-static int
+static gint
 get_token( const gchar ** sp, gchar ** token_val )
 {
 	gint kind;
@@ -743,7 +743,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 
 static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr )
 {
-	for( ; *str != '\0'; LDAP_UTF8_INCR(str) ) {
+	for(; *str != '\0'; LDAP_UTF8_INCR(str) ) {
 		if( ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr ) ) {
 			return (gchar *) str;
 		}
@@ -752,7 +752,7 @@ static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr )
 	return NULL;
 }
 
-static size_t ldap_utf8_strcspn( const gchar *str, const gchar *set )
+static gsize ldap_utf8_strcspn( const gchar *str, const gchar *set )
 {
 	const gchar *cstr;
 	const gchar *cset;
@@ -768,7 +768,7 @@ static size_t ldap_utf8_strcspn( const gchar *str, const gchar *set )
 	return cstr - str;
 }
 
-static size_t ldap_utf8_strspn( const gchar *str, const gchar *set )
+static gsize ldap_utf8_strspn( const gchar *str, const gchar *set )
 {
 	const gchar *cstr;
 	const gchar *cset;
@@ -843,15 +843,15 @@ static gchar *ldap_utf8_strtok(gchar *str, const gchar *sep, gchar **last)
 
 typedef struct ldap_url_desc {
 	struct ldap_url_desc *lud_next;
-	char	*lud_scheme;
-	char	*lud_host;
-	int		lud_port;
-	char	*lud_dn;
-	char	**lud_attrs;
-	int		lud_scope;
-	char	*lud_filter;
-	char	**lud_exts;
-	int		lud_crit_exts;
+	gchar	*lud_scheme;
+	gchar	*lud_host;
+	gint		lud_port;
+	gchar	*lud_dn;
+	gchar	**lud_attrs;
+	gint		lud_scope;
+	gchar	*lud_filter;
+	gchar	**lud_exts;
+	gint		lud_crit_exts;
 } LDAPURLDesc;
 
 /* from url.c */
@@ -979,7 +979,7 @@ ldap_free_urldesc( LDAPURLDesc *ludp )
 	LDAP_FREE( ludp );
 }
 
-static int
+static gint
 ldap_int_unhex( gint c )
 {
 	return( c >= '0' && c <= '9' ? c - '0'
@@ -994,7 +994,7 @@ ldap_pvt_hex_unescape( gchar *s )
 	 * Remove URL hex escapes from s... done in place.  The basic concept for
 	 * this routine is borrowed from the WWW library HTUnEscape() routine.
 	 */
-	char	*p;
+	gchar	*p;
 
 	for ( p = s; *s != '\0'; ++s ) {
 		if ( *s == '%' ) {
@@ -1017,10 +1017,10 @@ ldap_pvt_hex_unescape( gchar *s )
 static gchar **
 ldap_str2charray( const gchar *str_in, const gchar *brkstr )
 {
-	char	**res;
-	char	*str, *s;
-	char	*lasts;
-	int	i;
+	gchar	**res;
+	gchar	*str, *s;
+	gchar	*lasts;
+	gint	i;
 
 	/* protect the input string from strtok */
 	str = LDAP_STRDUP( str_in );
@@ -1051,7 +1051,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
 		res[i] = LDAP_STRDUP( s );
 
 		if(res[i] == NULL) {
-			for( --i ; i >= 0 ; i-- ) {
+			for( --i; i >= 0; i-- ) {
 				LDAP_FREE( res[i] );
 			}
 			LDAP_FREE( res );
@@ -1068,7 +1068,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
 	return( res );
 }
 
-static int
+static gint
 ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 {
 /*
@@ -1076,8 +1076,8 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
  */
 
 	LDAPURLDesc	*ludp;
-	char	*p, *q, *r;
-	int		i, enclosed;
+	gchar	*p, *q, *r;
+	gint		i, enclosed;
 	const gchar *scheme = NULL;
 	const gchar *url_tmp;
 	gchar *url;
@@ -1162,7 +1162,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	}
 
 	if ( q != NULL ) {
-		char	*next;
+		gchar	*next;
 
 		*q++ = '\0';
 		ldap_pvt_hex_unescape( q );
@@ -1392,7 +1392,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	return LDAP_URL_SUCCESS;
 }
 
-static int
+static gint
 ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 {
 	gint rc = ldap_url_parse_ext( url_in, ludpp );
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 7f3699f834..69d11b0e3c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -495,7 +495,7 @@ name_to_style (const EContactName *name, const gchar *company, gint style)
 	return string;
 }
 
-static int
+static gint
 file_as_get_style (EContactEditor *editor)
 {
 	GtkEntry *file_as = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (glade_xml_get_widget(editor->gui, "combo-file-as"))));
@@ -1533,7 +1533,7 @@ fill_in_im (EContactEditor *editor)
 
 	/* Clear */
 
-	for (record_n = 1 ; record_n <= IM_SLOTS; record_n++) {
+	for (record_n = 1; record_n <= IM_SLOTS; record_n++) {
 		fill_in_im_record (editor, record_n, -1, NULL, -1);
 	}
 
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index c8d795b2e8..1be9758627 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -183,7 +183,7 @@ dropdown_changed (GtkWidget *dropdown, dropdown_data *data)
 	return;
 }
 
-static int
+static gint
 mergeit (EContactMergingLookup *lookup)
 {
 	GtkWidget *scrolled_window, *label, *hbox, *dropdown;
@@ -218,7 +218,7 @@ mergeit (EContactMergingLookup *lookup)
 	num_of_email = g_list_length (email_attr_list);
 
 	/*we match all the string fields of the already existing contact and the new contact.*/
-	for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) {
+	for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
 		dropdown_data *data = NULL;
 		string = (gchar *)e_contact_get_const (lookup->contact, field);
 		string1 = (gchar *)e_contact_get_const (lookup->match, field);
@@ -369,7 +369,7 @@ check_if_same (EContact *contact, EContact *match)
 	gint num_of_email;
 	gchar *str = NULL, *string = NULL, *string1 = NULL;
 
-	for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) {
+	for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
 		email_attr_list = e_contact_get_attributes (match, E_CONTACT_EMAIL);
 		num_of_email = g_list_length (email_attr_list);
 
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index fd1681c5b1..dbcc1c1ed2 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -98,7 +98,7 @@ unlink_model(EAddressbookReflowAdapter *adapter)
 }
 
 
-static int
+static gint
 text_height (PangoLayout *layout, const gchar *text)
 {
 	gint height;
@@ -124,7 +124,7 @@ addressbook_set_width (EReflowModel *erm, gint width)
 }
 
 /* This function returns the number of items in our EReflowModel. */
-static int
+static gint
 addressbook_count (EReflowModel *erm)
 {
 	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
@@ -134,7 +134,7 @@ addressbook_count (EReflowModel *erm)
 }
 
 /* This function returns the height of the minicontact in question */
-static int
+static gint
 addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent)
 {
 	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
@@ -180,7 +180,7 @@ addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent)
 	return height;
 }
 
-static int
+static gint
 addressbook_compare (EReflowModel *erm, gint n1, gint n2)
 {
 	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
@@ -222,7 +222,7 @@ addressbook_compare (EReflowModel *erm, gint n1, gint n2)
 	}
 }
 
-static int
+static gint
 adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter)
 {
 	gint ret_val = 0;
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index cb63c67809..fabf87f24f 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -87,14 +87,14 @@ addressbook_dispose(GObject *object)
 }
 
 /* This function returns the number of columns in our ETableModel. */
-static int
+static gint
 addressbook_col_count (ETableModel *etc)
 {
 	return COLS;
 }
 
 /* This function returns the number of rows in our ETableModel. */
-static int
+static gint
 addressbook_row_count (ETableModel *etc)
 {
 	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc);
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index e8b9c5db5a..ece8d84654 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -126,7 +126,7 @@ clear_drag_data (EMinicardView *view)
 	view->drag_list = NULL;
 }
 
-static int
+static gint
 e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
 {
 	GdkDragContext *context;
@@ -475,7 +475,7 @@ do_remove (gint i, gpointer user_data)
 }
 
 #if 0
-static int
+static gint
 compare_to_utf_str (EMinicard *card, const gchar *utf_str)
 {
 	g_return_val_if_fail(card != NULL, 0);
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index c446e1affa..2d9deeecbc 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -875,7 +875,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, g
 	g_list_free (emails);
 }
 
-static int
+static gint
 get_left_width (EMinicard *e_minicard, gboolean is_list)
 {
 	gchar *name;
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 0b3e122846..a75c06daff 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -783,8 +783,8 @@ eab_contact_display_render_compact (EABContactDisplay *display,
 					max_dimension = calced_height;
 
 				if (max_dimension > MAX_COMPACT_IMAGE_DIMENSION) {
-					calced_width *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
-					calced_height *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
+					calced_width *= ((gfloat)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
+					calced_height *= ((gfloat)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
 				}
 			}
 
@@ -891,7 +891,7 @@ eab_contact_display_render_compact (EABContactDisplay *display,
 	gtk_html_end (GTK_HTML (display), html_stream, GTK_HTML_STREAM_OK);
 }
 
-static int
+static gint
 contact_display_button_press_event (GtkWidget *widget,
                                     GdkEvent *event,
                                     EABContactDisplay *display)
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 0456f81b19..9cce21d548 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -570,12 +570,12 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) {
 
 	line = g_string_new("");
 	while (1) {
-		c = fgetc (f) ;
+		c = fgetc (f);
 		if (c == EOF)
 			return NULL;
 		if (c == '\n') {
 			g_string_append_c (line, c);
-			break ;
+			break;
 		}
 		if (c == '"') {
 			g_string_append_c (line, c);
@@ -594,12 +594,12 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) {
 		g_string_free (line, TRUE);
 		line = g_string_new("");
 		while (1) {
-			c = fgetc (f) ;
+			c = fgetc (f);
 			if (c == EOF)
 				return NULL;
 			if (c == '\n') {
 				g_string_append_c (line, c);
-				break ;
+				break;
 			}
 			if (c == '"') {
 				g_string_append_c (line, c);
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 6c6710a479..cc55b97769 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -298,7 +298,7 @@ e_contact_start_new_column (EContactPrintContext *ctxt)
 	}
 }
 
-static int
+static gint
 contact_compare (EContact *contact1, EContact *contact2)
 {
 	const gchar *field1, *field2;
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index ec8fccb5ba..b3450a29cf 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -104,7 +104,7 @@ eab_name_and_email_query (EBook *book,
 		while (*t && *t != '@')
 			++t;
 		if (*t == '@' && escaped_name) {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", (int)(t-escaped_email), escaped_email);
+			email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", (gint)(t-escaped_email), escaped_email);
 
 		} else {
 			email_query = g_strdup_printf ("(beginswith \"email\" \"%s\")", escaped_email);
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index fe6f7dfe5d..e899ad203d 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -461,7 +461,7 @@ auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_
 	return password;
 }
 
-static int
+static gint
 start_calendar_server (ECalConduitContext *ctxt)
 {
 	gchar *str_uri = NULL;
@@ -575,7 +575,7 @@ get_ical_day (gint day)
 	return ICAL_NO_WEEKDAY;
 }
 
-static int
+static gint
 get_pilot_day (icalrecurrencetype_weekday wd)
 {
 	switch (wd) {
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 9a226f59b8..b22216eecd 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -356,7 +356,7 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	return buff;
 }
 
-static int
+static gint
 start_calendar_server (EMemoConduitContext *ctxt)
 {
 	g_return_val_if_fail (ctxt != NULL, -2);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index b0b5526fba..7ff2161772 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -449,7 +449,7 @@ auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_
 	return password;
 }
 
-static int
+static gint
 start_calendar_server (EToDoConduitContext *ctxt)
 {
 	gchar *str_uri = NULL;
diff --git a/calendar/gui/a11y/ea-day-view-main-item.c b/calendar/gui/a11y/ea-day-view-main-item.c
index 87cd266c5c..3bfd56f0b3 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.c
+++ b/calendar/gui/a11y/ea-day-view-main-item.c
@@ -551,7 +551,7 @@ ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
 	if (!g_obj)
-		return 0 ;
+		return 0;
 
 	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
 	day_view = main_item->day_view;
diff --git a/calendar/gui/a11y/ea-week-view-main-item.c b/calendar/gui/a11y/ea-week-view-main-item.c
index 065f2be528..74f4695a69 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.c
+++ b/calendar/gui/a11y/ea-week-view-main-item.c
@@ -536,7 +536,7 @@ ea_week_view_main_item_get_row_label (EaWeekViewMainItem *ea_main_item,
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
 	if (!g_obj)
-		return 0 ;
+		return 0;
 
 	return g_snprintf (buffer, buffer_size, "the %i week",
 			   row + 1);
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index d5fd1afdfb..e4aca02699 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1638,7 +1638,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 	ECalComponent *comp;
 	ECalComponentAlarm *alarm;
 	icalattach *attach;
-	int	flag = 0;
+	gint	flag = 0;
 
 	d(printf("%s:%d (audio_notification)\n",__FILE__, __LINE__));
 
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index f2ab4bb23d..c487d94503 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -158,7 +158,7 @@ setup_timeout (void)
 }
 
 /* Used from g_list_insert_sorted(); compares the trigger times of two AlarmRecord structures. */
-static int
+static gint
 compare_alarm_by_time (gconstpointer a, gconstpointer b)
 {
 	const AlarmRecord *ara = a;
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 5377c8d4b2..e0bbf10245 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -76,7 +76,7 @@ calculate_time (time_t start, time_t end)
 	}
 	if (i == 0 || difference != 0) {
 		/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
-		times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (int)difference);
+		times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
 	}
 
 	times[i] = NULL;
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 350b83ed78..c509561a17 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -288,10 +288,10 @@ get_current_category (CalSearchBar *cal_search)
 static gchar *
 get_show_option_sexp (CalSearchBar *cal_search)
 {
-	CalSearchBarPrivate *priv ;
-	gint viewid ;
+	CalSearchBarPrivate *priv;
+	gint viewid;
 	gchar *start, *end, *due, *ret = NULL;
-	const gchar *category = NULL ;
+	const gchar *category = NULL;
 	time_t start_range, end_range;
 
 	priv = cal_search->priv;
@@ -830,7 +830,7 @@ cal_search_bar_new (guint32 flags)
 }
 
 /* Used from qsort() */
-static int
+static gint
 compare_categories_cb (gconstpointer a, gconstpointer b)
 {
 	const gchar **ca, **cb;
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index bea2ca8d43..daa7e1c9a9 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -88,7 +88,7 @@ typedef struct
 
 	GList *notifications;
 
-	float	     vpane_pos;
+	gfloat	     vpane_pos;
 } CalendarComponentView;
 
 struct _CalendarComponentPrivate {
@@ -112,7 +112,7 @@ struct _CalendarComponentPrivate {
 static void
 calcomp_vpane_realized (GtkWidget *vpane, CalendarComponentView *view)
 {
-	gtk_paned_set_position (GTK_PANED (vpane), (int)(view->vpane_pos*vpane->allocation.height));
+	gtk_paned_set_position (GTK_PANED (vpane), (gint)(view->vpane_pos*vpane->allocation.height));
 
 }
 
@@ -121,7 +121,7 @@ calcomp_vpane_resized (GtkWidget *vpane, GdkEventButton *e, CalendarComponentVie
 {
 
 	view->vpane_pos = gtk_paned_get_position (GTK_PANED (vpane));
-	calendar_config_set_tag_vpane_pos (view->vpane_pos/(float)vpane->allocation.height);
+	calendar_config_set_tag_vpane_pos (view->vpane_pos/(gfloat)vpane->allocation.height);
 
 	return FALSE;
 }
@@ -294,7 +294,7 @@ impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environm
 		EUri *euri = e_uri_new (uri);
 		const gchar *p;
 		gchar *header, *content;
-		size_t len, clen;
+		gsize len, clen;
 		time_t start = -1, end = -1;
 
 		p = euri->query;
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index e98210fa57..f0b492d59c 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -658,7 +658,7 @@ calendar_config_set_month_vpane_pos	(gint	      vpane_pos)
 	gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, vpane_pos, NULL);
 }
 
-float
+gfloat
 calendar_config_get_tag_vpane_pos	(void)
 {
 	calendar_config_init ();
@@ -668,7 +668,7 @@ calendar_config_get_tag_vpane_pos	(void)
 
 
 void
-calendar_config_set_tag_vpane_pos	(float	      vpane_pos)
+calendar_config_set_tag_vpane_pos	(gfloat	      vpane_pos)
 {
 	calendar_config_init ();
 
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index b35888f842..adcf2c0c37 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -153,8 +153,8 @@ void	  calendar_config_set_month_hpane_pos	(gint	      hpane_pos);
 gint      calendar_config_get_month_vpane_pos	(void);
 void	  calendar_config_set_month_vpane_pos	(gint	      vpane_pos);
 
-float     calendar_config_get_tag_vpane_pos	(void);
-void	  calendar_config_set_tag_vpane_pos	(float	      vpane_pos);
+gfloat     calendar_config_get_tag_vpane_pos	(void);
+void	  calendar_config_set_tag_vpane_pos	(gfloat	      vpane_pos);
 
 /* The current list of task lists selected */
 GSList   *calendar_config_get_tasks_selected (void);
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 5284656d1d..ab411f9e7b 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1105,7 +1105,7 @@ action_changed_cb (GtkWidget *action_combo, gpointer data)
 	gint page = 0, i;
 
 	action = e_dialog_combo_box_get (dialog->action_combo, action_map);
-	for (i = 0; action_map[i] != -1 ; i++) {
+	for (i = 0; action_map[i] != -1; i++) {
 		if (action == action_map[i]) {
 			page = i;
 			break;
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 9ddd9af6cb..af4c4b8e1a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -421,7 +421,7 @@ ba_reminder_interval_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 	gint value;
 
 	str = gtk_entry_get_text (GTK_ENTRY (widget));
-	value = (int) g_ascii_strtod (str, NULL);
+	value = (gint) g_ascii_strtod (str, NULL);
 
 	calendar_config_set_ba_reminder (NULL, &value, NULL);
 }
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index ff08b7656c..e644a127a9 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2562,7 +2562,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 
 		num_attachments = e_cal_component_get_num_attachments (send_comp);
 
-		for (i = 0; i < num_attachments ; i++) {
+		for (i = 0; i < num_attachments; i++) {
 			attach_list = g_slist_append (attach_list, g_strdup ("CID:..."));
 		}
 		e_cal_component_set_attachment_list (send_comp, attach_list);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5e24495b5c..5fbf69df74 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -643,7 +643,7 @@ nth_weekday (gint pos, icalrecurrencetype_weekday weekday)
 {
 	g_assert (pos > 0 && pos <= 5);
 
-	return (pos << 3) | (int) weekday;
+	return (pos << 3) | (gint) weekday;
 }
 #endif
 
@@ -1312,7 +1312,7 @@ make_recurrence_special (RecurrencePage *rpage)
 }
 
 /* Counts the elements in the by_xxx fields of an icalrecurrencetype */
-static int
+static gint
 count_by_xxx (short *field, gint max_elements)
 {
 	gint i;
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 67aee1ecab..eeacc0774f 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -186,7 +186,7 @@ priority_value_to_index (gint priority_value)
 	return retval;
 }
 
-static int
+static gint
 priority_index_to_value (TaskEditorPriority priority)
 {
 	gint retval;
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 32e5b4214a..4fdf5e71eb 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -170,7 +170,7 @@ all_rows_deleted (EAlarmList *alarm_list)
 	i = g_list_length (alarm_list->list);
 	gtk_tree_path_append_index (path, i);
 
-	for ( ; i >= 0; i--) {
+	for (; i >= 0; i--) {
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (alarm_list), path);
 		gtk_tree_path_prev (path);
 	}
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 25bb9364d3..452ce88b34 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -107,7 +107,7 @@ e_cal_model_calendar_finalize (GObject *object)
 }
 
 /* ETableModel methods */
-static int
+static gint
 ecmc_column_count (ETableModel *etm)
 {
 	return E_CAL_MODEL_CALENDAR_FIELD_LAST;
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 7f05fbee47..995ed9c5cb 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -108,7 +108,7 @@ e_cal_model_memos_finalize (GObject *object)
 }
 
 /* ETableModel methods */
-static int
+static gint
 ecmm_column_count (ETableModel *etm)
 {
 	return E_CAL_MODEL_MEMOS_FIELD_LAST;
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 6e7996dfea..43b54db368 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -112,7 +112,7 @@ e_cal_model_tasks_finalize (GObject *object)
 }
 
 /* ETableModel methods */
-static int
+static gint
 ecmt_column_count (ETableModel *etm)
 {
 	return E_CAL_MODEL_TASKS_FIELD_LAST;
@@ -310,7 +310,7 @@ get_geo (ECalModelComponent *comp_data)
 	return (gpointer) "";
 }
 
-static int
+static gint
 get_percent (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 7a1b9477cf..4af9b88994 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -298,13 +298,13 @@ e_cal_model_finalize (GObject *object)
 
 /* ETableModel methods */
 
-static int
+static gint
 ecm_column_count (ETableModel *etm)
 {
 	return E_CAL_MODEL_FIELD_LAST;
 }
 
-static int
+static gint
 ecm_row_count (ETableModel *etm)
 {
 	ECalModelPrivate *priv;
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 885f9afb90..3c11aa7238 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -361,7 +361,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
 
 	e_cal_component_get_organizer (new_comp, &organizer);
 	if (organizer.cn) {
-		gchar *ptr ;
+		gchar *ptr;
 		ptr = strchr( organizer.value, ':');
 
 		if (ptr) {
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 88fe49c17e..330bd0eb68 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2334,7 +2334,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 
 	e_cal_component_get_organizer (newcomp, &organiser);
 	if (organiser.cn) {
-		gchar *ptr ;
+		gchar *ptr;
 		ptr = strchr(organiser.value, ':');
 
 		if (ptr) {
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index bf75f5ff04..5160f1b419 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -168,7 +168,7 @@ all_rows_deleted (EDateTimeList *date_time_list)
 	i = g_list_length (date_time_list->list);
 	gtk_tree_path_append_index (path, i);
 
-	for ( ; i >= 0; i--) {
+	for (; i >= 0; i--) {
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (date_time_list), path);
 		gtk_tree_path_prev (path);
 	}
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 2a705b809f..c97db277d8 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -620,7 +620,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	gdouble date_fraction;
 	gboolean short_event = FALSE, resize_flag = FALSE;
 	const gchar *end_resize_suffix;
-	gchar *end_resize_time;
+	gchar *end_regsizeime;
 	gint start_hour, start_display_hour, start_minute, start_suffix_width;
 	gint end_hour, end_display_hour, end_minute, end_suffix_width;
 	gboolean show_span = FALSE, format_time;
@@ -972,12 +972,12 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 
 			if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
 				cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 32, item_y + item_h - 8);
-				end_resize_time = g_strdup_printf ("%2i:%02i",
+				end_regsizeime = g_strdup_printf ("%2i:%02i",
 					 end_display_hour, end_minute);
 
 			} else {
 				cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 48, item_y + item_h - 8);
-				end_resize_time = g_strdup_printf ("%2i:%02i%s",
+				end_regsizeime = g_strdup_printf ("%2i:%02i%s",
 						 end_display_hour, end_minute,
 						 end_resize_suffix);
 			}
@@ -987,7 +987,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 			else
 				cairo_set_source_rgb (cr, 1, 1, 1);
 			cairo_set_font_options (cr, font_options);
-			cairo_show_text (cr, end_resize_time);
+			cairo_show_text (cr, end_regsizeime);
 			cairo_close_path (cr);
 			cairo_restore (cr);
 		}
@@ -1021,7 +1021,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 		cairo_restore (cr);
 
 		/* This is for achieving the white stripes in vbar across event color */
-		for (i = 0; i <= (bar_y2 - bar_y1) ; i+=4) {
+		for (i = 0; i <= (bar_y2 - bar_y1); i+=4) {
 			cairo_set_source_rgb (cr, 1, 1, 1);
 			cairo_set_line_width (cr, 0.3);
 			cairo_move_to (cr, item_x + 1, bar_y1 + i);
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 78bf55863f..232534d51a 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -274,11 +274,11 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
 static void
 edvti_draw_zone (GnomeCanvasItem   *canvas_item,
 		GdkDrawable	   *drawable,
-		int		    x,
-		int		    y,
-		int		    width,
-		int		    height,
-		int		    x_offset,
+		gint		    x,
+		gint		    y,
+		gint		    width,
+		gint		    height,
+		gint		    x_offset,
 		icaltimezone       *use_zone)
 {
 	EDayView *day_view;
@@ -609,10 +609,10 @@ edvti_draw_zone (GnomeCanvasItem   *canvas_item,
 static void
 e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 			   GdkDrawable	   *drawable,
-			   int		    x,
-			   int		    y,
-			   int		    width,
-			   int		    height)
+			   gint		    x,
+			   gint		    y,
+			   gint		    width,
+			   gint		    height)
 {
 	EDayViewTimeItem *dvtmitem;
 
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 7579f00986..31cce40a5a 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -44,20 +44,20 @@ static void e_day_view_top_item_set_property	(GObject	 *object,
 static void e_day_view_top_item_update		(GnomeCanvasItem *item,
 						 double		 *affine,
 						 ArtSVP		 *clip_path,
-						 int		  flags);
+						 gint		  flags);
 static void e_day_view_top_item_draw		(GnomeCanvasItem *item,
 						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
+						 gint		  x,
+						 gint		  y,
+						 gint		  width,
+						 gint		  height);
 static void e_day_view_top_item_draw_long_event	(EDayViewTopItem *dvtitem,
 						 gint		  event_num,
 						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
+						 gint		  x,
+						 gint		  y,
+						 gint		  width,
+						 gint		  height);
 static void e_day_view_top_item_draw_triangle	(EDayViewTopItem *dvtitem,
 						 GdkDrawable	 *drawable,
 						 gint		  x,
@@ -68,8 +68,8 @@ static void e_day_view_top_item_draw_triangle	(EDayViewTopItem *dvtitem,
 static double e_day_view_top_item_point		(GnomeCanvasItem *item,
 						 double		  x,
 						 double		  y,
-						 int		  cx,
-						 int		  cy,
+						 gint		  cx,
+						 gint		  cy,
 						 GnomeCanvasItem **actual_item);
 static gint e_day_view_top_item_event		(GnomeCanvasItem *item,
 						 GdkEvent	 *event);
@@ -155,7 +155,7 @@ static void
 e_day_view_top_item_update (GnomeCanvasItem *item,
 			    double	    *affine,
 			    ArtSVP	    *clip_path,
-			    int		     flags)
+			    gint		     flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (e_day_view_top_item_parent_class)->update)
 		(* GNOME_CANVAS_ITEM_CLASS (e_day_view_top_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -174,10 +174,10 @@ e_day_view_top_item_update (GnomeCanvasItem *item,
 static void
 e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 			  GdkDrawable	  *drawable,
-			  int		   x,
-			  int		   y,
-			  int		   width,
-			  int		   height)
+			  gint		   x,
+			  gint		   y,
+			  gint		   width,
+			  gint		   height)
 {
 	EDayViewTopItem *dvtitem;
 	EDayView *day_view;
@@ -358,10 +358,10 @@ static void
 e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 				     gint	      event_num,
 				     GdkDrawable     *drawable,
-				     int	      x,
-				     int	      y,
-				     int	      width,
-				     int	      height)
+				     gint	      x,
+				     gint	      y,
+				     gint	      width,
+				     gint	      height)
 {
 	EDayView *day_view;
 	EDayViewEvent *event;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 7b76e008d7..5ee20f249c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -5989,7 +5989,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			data->cal_view = (ECalendarView *)day_view;
 			data->day = day;
 			data->event_num = event_num;
-			data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
+			data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
 			pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
 
 		return TRUE;
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index b555c41f6c..da60b19f43 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -217,7 +217,7 @@ get_flags (GtkTreeModel *model)
 	return GTK_TREE_MODEL_ITERS_PERSIST | GTK_TREE_MODEL_LIST_ONLY;
 }
 
-static int
+static gint
 get_n_columns (GtkTreeModel *model)
 {
 	g_return_val_if_fail (E_IS_MEETING_STORE (model), 0);
@@ -400,7 +400,7 @@ iter_has_child (GtkTreeModel *model, GtkTreeIter *iter)
 	return FALSE;
 }
 
-static int
+static gint
 iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
 {
 	g_return_val_if_fail (E_IS_MEETING_STORE (model), -1);
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index da33eb4174..16b6a9d48c 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -871,7 +871,7 @@ e_meeting_time_selector_unrealize (GtkWidget *widget)
 		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)(widget);
 }
 
-static int
+static gint
 get_cell_height (GtkTreeView *tree)
 {
 	GtkTreeViewColumn *column;
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 3e604f8bbe..4ad24e5a34 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -297,7 +297,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
 
 	e_cal_component_get_organizer (new_comp, &organizer);
 	if (organizer.cn) {
-		gchar *ptr ;
+		gchar *ptr;
 		ptr = strchr( organizer.value, ':');
 
 		if (ptr) {
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 2d0cf1ab5d..28660fd3b9 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -79,7 +79,7 @@ static void
 e_timezone_entry_class_init		(ETimezoneEntryClass	*class)
 {
 	GtkObjectClass *object_class = (GtkObjectClass *) class;
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class) ;
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
 	object_class = (GtkObjectClass*) class;
 
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index f72c9dfcb1..6ab551e6fc 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -46,13 +46,13 @@ static void e_week_view_event_item_set_property	(GObject	 *object,
 static void e_week_view_event_item_update	(GnomeCanvasItem *item,
 						 double		 *affine,
 						 ArtSVP		 *clip_path,
-						 int		  flags);
+						 gint		  flags);
 static void e_week_view_event_item_draw		(GnomeCanvasItem *item,
 						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
+						 gint		  x,
+						 gint		  y,
+						 gint		  width,
+						 gint		  height);
 static void e_week_view_draw_time		(EWeekView	*week_view,
 						 GdkDrawable	*drawable,
 						 gint		 time_x,
@@ -74,8 +74,8 @@ static void e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
 static double e_week_view_event_item_point	(GnomeCanvasItem *item,
 						 double		  x,
 						 double		  y,
-						 int		  cx,
-						 int		  cy,
+						 gint		  cx,
+						 gint		  cy,
 						 GnomeCanvasItem **actual_item);
 static gint e_week_view_event_item_event	(GnomeCanvasItem *item,
 						 GdkEvent	 *event);
@@ -179,7 +179,7 @@ static void
 e_week_view_event_item_update (GnomeCanvasItem *item,
 			       double	       *affine,
 			       ArtSVP	       *clip_path,
-			       int		flags)
+			       gint		flags)
 {
 	EWeekViewEventItem *wveitem;
 	EWeekView *week_view;
@@ -226,10 +226,10 @@ e_week_view_event_item_update (GnomeCanvasItem *item,
 static void
 e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
 			     GdkDrawable      *drawable,
-			     int	       x,
-			     int	       y,
-			     int	       width,
-			     int	       height)
+			     gint	       x,
+			     gint	       y,
+			     gint	       width,
+			     gint	       height)
 {
 	EWeekViewEventItem *wveitem;
 	EWeekView *week_view;
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 134b318118..8f0cb5ece8 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -432,7 +432,7 @@ e_week_view_layout_get_span_position	(EWeekViewEvent *event,
 	if (span->row >= rows_per_compressed_cell) {
 		if (multi_week_view) {
 			if (compress_weekend) {
-				/* If it ends on a Saturday and is 1 day long
+				/* If it ends on a Saturday and is 1 day glong
 				   we skip it, else we shorten it. If it ends
 				   on a Sunday it must be 1 day long and we
 				   skip it. */
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index e0b14637ae..aee26922ea 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -38,13 +38,13 @@ static void e_week_view_main_item_set_property	(GObject	 *object,
 static void e_week_view_main_item_update	(GnomeCanvasItem *item,
 						 double		 *affine,
 						 ArtSVP		 *clip_path,
-						 int		  flags);
+						 gint		  flags);
 static void e_week_view_main_item_draw		(GnomeCanvasItem *item,
 						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
+						 gint		  x,
+						 gint		  y,
+						 gint		  width,
+						 gint		  height);
 static void e_week_view_main_item_draw_day	(EWeekViewMainItem *wvmitem,
 						 gint		   day,
 						 GDate		  *date,
@@ -56,8 +56,8 @@ static void e_week_view_main_item_draw_day	(EWeekViewMainItem *wvmitem,
 static double e_week_view_main_item_point	(GnomeCanvasItem *item,
 						 double		  x,
 						 double		  y,
-						 int		  cx,
-						 int		  cy,
+						 gint		  cx,
+						 gint		  cy,
 						 GnomeCanvasItem **actual_item);
 
 /* The arguments we take */
@@ -129,7 +129,7 @@ static void
 e_week_view_main_item_update (GnomeCanvasItem *item,
 			      double	      *affine,
 			      ArtSVP	      *clip_path,
-			      int	       flags)
+			      gint	       flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update)
 		(* GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -148,10 +148,10 @@ e_week_view_main_item_update (GnomeCanvasItem *item,
 static void
 e_week_view_main_item_draw (GnomeCanvasItem  *canvas_item,
 			    GdkDrawable      *drawable,
-			    int		      x,
-			    int		      y,
-			    int		      width,
-			    int		      height)
+			    gint		      x,
+			    gint		      y,
+			    gint		      width,
+			    gint		      height)
 {
 	EWeekViewMainItem *wvmitem;
 	EWeekView *week_view;
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 7a5ae4bf9b..e9ff467b63 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -36,18 +36,18 @@ static void e_week_view_titles_item_set_property(GObject	 *object,
 static void e_week_view_titles_item_update	(GnomeCanvasItem *item,
 						 double		 *affine,
 						 ArtSVP		 *clip_path,
-						 int		  flags);
+						 gint		  flags);
 static void e_week_view_titles_item_draw	(GnomeCanvasItem *item,
 						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
+						 gint		  x,
+						 gint		  y,
+						 gint		  width,
+						 gint		  height);
 static double e_week_view_titles_item_point	(GnomeCanvasItem *item,
 						 double		  x,
 						 double		  y,
-						 int		  cx,
-						 int		  cy,
+						 gint		  cx,
+						 gint		  cy,
 						 GnomeCanvasItem **actual_item);
 
 /* The arguments we take */
@@ -114,7 +114,7 @@ static void
 e_week_view_titles_item_update (GnomeCanvasItem *item,
 				double	    *affine,
 				ArtSVP	    *clip_path,
-				int		     flags)
+				gint		     flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update)
 		(* GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -134,10 +134,10 @@ e_week_view_titles_item_update (GnomeCanvasItem *item,
 static void
 e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
 			      GdkDrawable      *drawable,
-			      int		x,
-			      int		y,
-			      int		width,
-			      int		height)
+			      gint		x,
+			      gint		y,
+			      gint		width,
+			      gint		height)
 {
 	EWeekViewTitlesItem *wvtitem;
 	EWeekView *week_view;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 4d0e97b5f0..c939d280de 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2711,7 +2711,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
 			data->cal_view = (ECalendarView *)view;
 			data->day = -1;
 			data->event_num = event_num;
-			data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
+			data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
 			pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
 			g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
 
@@ -3295,7 +3295,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 		data->cal_view = (ECalendarView *)week_view;
 		data->day = -1;
 		data->event_num = nevent;
-		data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
+		data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
 		pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
 		g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index a46995a4d5..bcd30b0105 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2021,9 +2021,9 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra
 	E_CALENDAR_VIEW (priv->views [view_type])->in_focus = TRUE;
 
 	gtk_notebook_set_current_page (
-		GTK_NOTEBOOK (priv->notebook), (int) view_type);
+		GTK_NOTEBOOK (priv->notebook), (gint) view_type);
 
-	for (i = 0; i < GNOME_CAL_LAST_VIEW ; i++) {
+	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
 		if (i == view_type)
 			continue;
 		E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE;
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 9056650ea8..2287f59248 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -654,7 +654,7 @@ comp_subject (ECalComponentItipMethod method, ECalComponent *comp)
 		sender = itip_get_comp_attendee (comp, NULL);
 		if (sender) {
 
-			for (l = alist; l != NULL ; l = l->next) {
+			for (l = alist; l != NULL; l = l->next) {
 				a = l->data;
 				if ((sender && *sender) && (g_ascii_strcasecmp (itip_strip_mailto (a->value), sender) || (a->sentby && g_ascii_strcasecmp (itip_strip_mailto (a->sentby), sender))))
 					break;
@@ -1160,7 +1160,7 @@ append_cal_attachments (EMsgComposer *composer,
 	struct CalMimeAttach *mime_attach;
 	GSList *l;
 
-	for (l = attach_list; l ; l = l->next) {
+	for (l = attach_list; l; l = l->next) {
 		CamelMimePart *attachment;
 
 		mime_attach = (struct CalMimeAttach *) l->data;
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index c6a4dddd54..2e45ad4ec9 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -292,7 +292,7 @@ setup_create_ecal (MemosComponent *component, MemosComponentView *component_view
 	/* Save the primary source for use elsewhere */
 	calendar_config_set_primary_memos (e_source_peek_uid (source));
 
-	return priv->create_ecal ;
+	return priv->create_ecal;
 }
 
 /* Ensures the calendar is selected */
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 9fdf6f971b..36490c5463 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -55,7 +55,7 @@ string_is_empty (const gchar *value)
 	if (value) {
 		p = value;
 		while (*p) {
-			if (!isspace ((unsigned char) *p)) {
+			if (!isspace ((guchar) *p)) {
 				empty = FALSE;
 				break;
 			}
@@ -123,7 +123,7 @@ calculate_time (time_t start, time_t end)
 	}
 	if (i == 0 || difference != 0) {
 		/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
-		times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (int)difference);
+		times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
 	}
 
 	times[i] = NULL;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 6ecd39f260..fdb6f8a207 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -240,7 +240,7 @@ build_month (gint month, gint year, gint *days, gint *start, gint *end)
 	/* Note that months are zero-based, so September is month 8 */
 
 	if ((year == 1752) && (month == 8)) {
-		memcpy (days, sept_1752, 42 * sizeof (int));
+		memcpy (days, sept_1752, 42 * sizeof (gint));
 
 		if (start)
 			*start = SEPT_1752_START;
@@ -818,7 +818,7 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
 	row = 0;
 	hour_minute_x = left + width * 0.58;
 	for (i = pdi->start_hour; i < pdi->end_hour; i++) {
-		y = top + yinc * (row + 1) ;
+		y = top + yinc * (row + 1);
 		cr = gtk_print_context_get_cairo_context (context);
 		cairo_set_source_rgb (cr, 0, 0, 0);
 
@@ -2646,7 +2646,7 @@ print_comp_draw_real (GtkPrintOperation *operation,
 						     categories);
 		top = bound_text (context, font, categories_string, -1,
 				  0.0, top, width, height, TRUE, &page_start, &pages);
-		top += get_font_size (font) - 6 ;
+		top += get_font_size (font) - 6;
 		g_free (categories_string);
 	}
 
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 039ad9ac87..02783496f6 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -493,7 +493,7 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view
 	/* Save the primary source for use elsewhere */
 	calendar_config_set_primary_tasks (e_source_peek_uid (source));
 
-	return priv->create_ecal ;
+	return priv->create_ecal;
 }
 
 /* Ensures the calendar is selected */
@@ -645,7 +645,7 @@ impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environm
 		EUri *euri = e_uri_new (uri);
 		const gchar *p;
 		gchar *header, *content;
-		size_t len, clen;
+		gsize len, clen;
 
 		p = euri->query;
 		if (p) {
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 42a69b41f6..5fa7f7a541 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -55,13 +55,13 @@ static void tasks_control_activate_cb		(BonoboControl		*control,
 						 gpointer		 user_data);
 static void tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
 						 gpointer		 data,
-						 const char		*path);
+						 const gchar		*path);
 static void tasks_control_complete_cmd		(BonoboUIComponent	*uic,
 						 gpointer		 data,
-						 const char		*path);
+						 const gchar		*path);
 static void tasks_control_purge_cmd		(BonoboUIComponent	*uic,
 						 gpointer		 data,
-						 const char		*path);
+						 const gchar		*path);
 static void tasks_control_assign_cmd           (BonoboUIComponent      *uic,
                                                 gpointer               data,
                                                 const gchar             *path);
@@ -269,7 +269,7 @@ tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
 static void
 tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
 					 gpointer		 data,
-					 const char		*path)
+					 const gchar		*path)
 {
 	ETasks *tasks;
 
@@ -280,7 +280,7 @@ tasks_control_new_task_cmd		(BonoboUIComponent	*uic,
 static void
 tasks_control_complete_cmd		(BonoboUIComponent	*uic,
 					 gpointer		 data,
-					 const char		*path)
+					 const gchar		*path)
 {
 	ETasks *tasks;
 
@@ -325,7 +325,7 @@ confirm_purge (ETasks *tasks)
 static void
 tasks_control_purge_cmd	(BonoboUIComponent	*uic,
 			 gpointer		 data,
-			 const char		*path)
+			 const gchar		*path)
 {
 	ETasks *tasks;
 
diff --git a/calendar/module/e-cal-shell-migrate.c b/calendar/module/e-cal-shell-migrate.c
index 911dfcbd4a..9887a5332c 100644
--- a/calendar/module/e-cal-shell-migrate.c
+++ b/calendar/module/e-cal-shell-migrate.c
@@ -177,7 +177,7 @@ dialog_set_progress (double percent)
 {
 	gchar text[5];
 
-	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
+	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
 
 	gtk_progress_bar_set_fraction (progress, percent);
 	gtk_progress_bar_set_text (progress, text);
@@ -213,7 +213,7 @@ get_source_name (ESourceGroup *group, const gchar *path)
 	gboolean conflict;
 	GString *s = g_string_new (NULL);
 
-	for (i = 0; p[i]; i ++) ;
+	for (i = 0; p[i]; i ++);
 
 	num_elements = i;
 	i--;
@@ -383,9 +383,9 @@ migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *o
 		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
 			/* pilot map file - src and dest file formats are identical */
 			guchar inbuf[4096];
-			size_t nread, nwritten;
+			gsize nread, nwritten;
 			gint fd0, fd1;
-			ssize_t n;
+			gssize n;
 
 			filename = g_build_filename (old_path, dent, NULL);
 			if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {
diff --git a/calendar/module/e-memo-shell-migrate.c b/calendar/module/e-memo-shell-migrate.c
index 5a161cf634..d2e7df6d1b 100644
--- a/calendar/module/e-memo-shell-migrate.c
+++ b/calendar/module/e-memo-shell-migrate.c
@@ -145,7 +145,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name,  const gchar
 {
 	ESourceGroup *group;
 	ESource *source;
-	GSList *ids, *temp ;
+	GSList *ids, *temp;
 	GError *error = NULL;
 	gchar *relative_uri;
 	const gchar *soap_port;
diff --git a/calendar/module/e-task-shell-migrate.c b/calendar/module/e-task-shell-migrate.c
index 4fc8b8c752..ced54bafdf 100644
--- a/calendar/module/e-task-shell-migrate.c
+++ b/calendar/module/e-task-shell-migrate.c
@@ -143,7 +143,7 @@ dialog_set_progress (double percent)
 {
 	gchar text[5];
 
-	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
+	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
 
 	gtk_progress_bar_set_fraction (progress, percent);
 	gtk_progress_bar_set_text (progress, text);
@@ -179,7 +179,7 @@ get_source_name (ESourceGroup *group, const gchar *path)
 	gboolean conflict;
 	GString *s = g_string_new (NULL);
 
-	for (i = 0; p[i]; i ++) ;
+	for (i = 0; p[i]; i ++);
 
 	num_elements = i;
 	i--;
@@ -349,9 +349,9 @@ migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *o
 		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
 			/* pilot map file - src and dest file formats are identical */
 			guchar inbuf[4096];
-			size_t nread, nwritten;
+			gsize nread, nwritten;
 			gint fd0, fd1;
-			ssize_t n;
+			gssize n;
 
 			filename = g_build_filename (old_path, dent, NULL);
 			if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 7a178e3944..522538adcd 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -135,7 +135,7 @@ static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *mul
  * Return Value: The part in displayable html format.
  **/
 static gchar *
-emcu_part_to_html (CamelMimePart *part, ssize_t *len, EMFormat *source)
+emcu_part_to_html (CamelMimePart *part, gssize *len, EMFormat *source)
 {
 	EMFormatQuote *emfq;
 	CamelStreamMem *mem;
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));
diff --git a/em-format/em-format.c b/em-format/em-format.c
index bee5f0c9fa..8f2046c2ed 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -356,7 +356,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type)
 	if (s == NULL)
 		mime = (gchar *)mime_type;
 	else {
-		size_t len = (s-mime_type)+1;
+		gsize len = (s-mime_type)+1;
 
 		mime = alloca(len+2);
 		strncpy(mime, mime_type, len);
@@ -391,7 +391,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type)
  * are resolved by forgetting the old PURI in the global index.
  **/
 EMFormatPURI *
-em_format_add_puri(EMFormat *emf, size_t size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func)
+em_format_add_puri(EMFormat *emf, gsize size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func)
 {
 	EMFormatPURI *puri;
 	const gchar *tmp;
@@ -1204,8 +1204,8 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
 	const gchar *charset = NULL;
 	CamelMimeFilterWindows *windows = NULL;
 	CamelStream *mem_stream = NULL;
-	size_t size;
-	size_t max;
+	gsize size;
+	gsize max;
 	GConfClient *gconf;
 
 	if (emf->charset) {
diff --git a/em-format/em-format.h b/em-format/em-format.h
index 652ec33ae8..a92da57822 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -302,10 +302,10 @@ void		em_format_add_header		(EMFormat *emf,
 /* FIXME: Need a 'clone' api to copy details about the current view (inlines etc)
    Or maybe it should live with sub-classes? */
 
-int		em_format_is_attachment		(EMFormat *emf,
+gint		em_format_is_attachment		(EMFormat *emf,
 						 CamelMimePart *part);
 
-int		em_format_is_inline		(EMFormat *emf,
+gint		em_format_is_inline		(EMFormat *emf,
 						 const gchar *partid,
 						 CamelMimePart *part,
 						 const EMFormatHandler *handle);
@@ -332,7 +332,7 @@ const EMFormatHandler *
 
 /* puri is short for pending uri ... really */
 EMFormatPURI *	em_format_add_puri		(EMFormat *emf,
-						 size_t size,
+						 gsize size,
 						 const gchar *uri,
 						 CamelMimePart *part,
 						 EMFormatPURIFunc func);
diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c
index 1b977e975f..65400027ff 100644
--- a/em-format/em-stripsig-filter.c
+++ b/em-format/em-stripsig-filter.c
@@ -34,10 +34,10 @@
 static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass);
 static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass);
 
-static void filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace,
-			   gchar **out, size_t *outlen, size_t *outprespace);
-static void filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace,
-			     gchar **out, size_t *outlen, size_t *outprespace);
+static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+			   gchar **out, gsize *outlen, gsize *outprespace);
+static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+			     gchar **out, gsize *outlen, gsize *outprespace);
 static void filter_reset (CamelMimeFilter *filter);
 
 
@@ -83,8 +83,8 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass)
 }
 
 static void
-strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace,
-		 gchar **out, size_t *outlen, size_t *outprespace, gint flush)
+strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+		 gchar **out, gsize *outlen, gsize *outprespace, gint flush)
 {
 	EMStripSigFilter *stripsig = (EMStripSigFilter *) filter;
 	register const gchar *inptr = in;
@@ -132,15 +132,15 @@ strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace
 }
 
 static void
-filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace,
-	       gchar **out, size_t *outlen, size_t *outprespace)
+filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+	       gchar **out, gsize *outlen, gsize *outprespace)
 {
 	strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE);
 }
 
 static void
-filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace,
-		 gchar **out, size_t *outlen, size_t *outprespace)
+filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+		 gchar **out, gsize *outlen, gsize *outprespace)
 {
 	strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE);
 }
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index c175829a5e..7672a77be6 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -116,7 +116,7 @@ filter_colour_new (void)
 	return (FilterColour *) g_object_new (FILTER_TYPE_COLOUR, NULL, NULL);
 }
 
-static int
+static gint
 colour_eq (FilterElement *fe, FilterElement *cm)
 {
 	FilterColour *fc = (FilterColour *) fe;
@@ -151,7 +151,7 @@ xml_encode (FilterElement *fe)
 	return value;
 }
 
-static int
+static gint
 xml_decode (FilterElement *fe, xmlNodePtr node)
 {
 	FilterColour *fc = (FilterColour *)fe;
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 4ab85d36bf..a7ef49981e 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -66,7 +66,7 @@ typedef struct _timespan {
 	const gchar *past_plural;
 	const gchar *future_singular;
 	const gchar *future_plural;
-	float max;
+	gfloat max;
 } timespan;
 
 #ifdef ngettext
@@ -195,7 +195,7 @@ validate (FilterElement *fe)
 	return valid;
 }
 
-static int
+static gint
 date_eq (FilterElement *fe, FilterElement *cm)
 {
 	FilterDatespec *fd = (FilterDatespec *)fe, *cd = (FilterDatespec *)cm;
@@ -228,13 +228,13 @@ xml_encode (FilterElement *fe)
 	work = xmlNewChild (value, NULL, (const guchar *)"datespec", NULL);
 	sprintf (str, "%d", fds->type);
 	xmlSetProp (work, (const guchar *)"type", (guchar *)str);
-	sprintf (str, "%d", (int)fds->value);
+	sprintf (str, "%d", (gint)fds->value);
 	xmlSetProp (work, (const guchar *)"value", (guchar *)str);
 
 	return value;
 }
 
-static int
+static gint
 xml_decode (FilterElement *fe, xmlNodePtr node)
 {
 	FilterDatespec *fds = (FilterDatespec *)fe;
@@ -263,7 +263,7 @@ xml_decode (FilterElement *fe, xmlNodePtr node)
 	return 0;
 }
 
-static int
+static gint
 get_best_span (time_t val)
 {
 	gint i;
@@ -508,13 +508,13 @@ format_sexp (FilterElement *fe, GString *out)
 		g_string_append (out, "(get-current-date)");
 		break;
 	case FDST_SPECIFIED:
-		g_string_append_printf (out, "%d", (int) fds->value);
+		g_string_append_printf (out, "%d", (gint) fds->value);
 		break;
 	case FDST_X_AGO:
-		g_string_append_printf (out, "(- (get-current-date) %d)", (int) fds->value);
+		g_string_append_printf (out, "(- (get-current-date) %d)", (gint) fds->value);
 		break;
 	case FDST_X_FUTURE:
-		g_string_append_printf (out, "(+ (get-current-date) %d)", (int) fds->value);
+		g_string_append_printf (out, "(+ (get-current-date) %d)", (gint) fds->value);
 		break;
 	}
 }
diff --git a/filter/filter-element.c b/filter/filter-element.c
index f2d65d63b4..7eb898f025 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -244,7 +244,7 @@ validate (FilterElement *fe)
 	return TRUE;
 }
 
-static int
+static gint
 element_eq (FilterElement *fe, FilterElement *cm)
 {
 	return ((fe->name && cm->name && strcmp (fe->name, cm->name) == 0)
diff --git a/filter/filter-element.h b/filter/filter-element.h
index 4c105a77c3..5a78c98980 100644
--- a/filter/filter-element.h
+++ b/filter/filter-element.h
@@ -77,12 +77,12 @@ void            filter_element_set_data (FilterElement *fe, gpointer data);
 
 /* methods */
 gboolean        filter_element_validate         (FilterElement *fe);
-int		filter_element_eq		(FilterElement *fe, FilterElement *cm);
+gint		filter_element_eq		(FilterElement *fe, FilterElement *cm);
 
 void		filter_element_xml_create	(FilterElement *fe, xmlNodePtr node);
 
 xmlNodePtr	filter_element_xml_encode	(FilterElement *fe);
-int		filter_element_xml_decode	(FilterElement *fe, xmlNodePtr node);
+gint		filter_element_xml_decode	(FilterElement *fe, xmlNodePtr node);
 FilterElement	*filter_element_clone		(FilterElement *fe);
 void		filter_element_copy_value	(FilterElement *de, FilterElement *se);
 
diff --git a/filter/filter-file.c b/filter/filter-file.c
index 0d421042e6..ea14fadb12 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -184,7 +184,7 @@ validate (FilterElement *fe)
 	return TRUE;
 }
 
-static int
+static gint
 file_eq (FilterElement *fe, FilterElement *cm)
 {
 	FilterFile *ff = (FilterFile *)fe, *cf = (FilterFile *)cm;
@@ -224,7 +224,7 @@ xml_encode (FilterElement *fe)
 	return value;
 }
 
-static int
+static gint
 xml_decode (FilterElement *fe, xmlNodePtr node)
 {
 	FilterFile *file = (FilterFile *)fe;
diff --git a/filter/filter-input.c b/filter/filter-input.c
index 5eeed60de7..690ccd6e48 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -175,7 +175,7 @@ validate (FilterElement *fe)
 		pattern = fi->values->data;
 
 		if ((regerr = regcomp (&regexpat, pattern, REG_EXTENDED | REG_NEWLINE | REG_ICASE))) {
-			size_t reglen;
+			gsize reglen;
 			gchar *regmsg;
 
 			/* regerror gets called twice to get the full error string
@@ -200,7 +200,7 @@ validate (FilterElement *fe)
 	return valid;
 }
 
-static int
+static gint
 list_eq (GList *al, GList *bl)
 {
 	gint truth = TRUE;
@@ -214,7 +214,7 @@ list_eq (GList *al, GList *bl)
 	return truth && al == NULL && bl == NULL;
 }
 
-static int
+static gint
 input_eq (FilterElement *fe, FilterElement *cm)
 {
 	FilterInput *fi = (FilterInput *)fe, *ci = (FilterInput *)cm;
@@ -263,7 +263,7 @@ xml_encode (FilterElement *fe)
 	return value;
 }
 
-static int
+static gint
 xml_decode (FilterElement *fe, xmlNodePtr node)
 {
 	FilterInput *fi = (FilterInput *)fe;
diff --git a/filter/filter-int.c b/filter/filter-int.c
index 220e12fb38..9d72fdfdc8 100644
--- a/filter/filter-int.c
+++ b/filter/filter-int.c
@@ -144,7 +144,7 @@ filter_int_set_value (FilterInt *fi, gint val)
 	fi->val = val;
 }
 
-static int
+static gint
 int_eq (FilterElement *fe, FilterElement *cm)
 {
         return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm)
@@ -193,7 +193,7 @@ xml_encode (FilterElement *fe)
 	return value;
 }
 
-static int
+static gint
 xml_decode (FilterElement *fe, xmlNodePtr node)
 {
 	FilterInt *fs = (FilterInt *)fe;
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 5341705986..07e7ee950d 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -211,7 +211,7 @@ filter_option_remove_all (FilterOption *fo)
 	fo->current = NULL;
 }
 
-static int
+static gint
 option_eq(FilterElement *fe, FilterElement *cm)
 {
 	FilterOption *fo = (FilterOption *)fe, *co = (FilterOption *)cm;
@@ -322,7 +322,7 @@ xml_encode (FilterElement *fe)
 	return value;
 }
 
-static int
+static gint
 xml_decode (FilterElement *fe, xmlNodePtr node)
 {
 	FilterOption *fo = (FilterOption *)fe;
diff --git a/filter/filter-part.c b/filter/filter-part.c
index f8dc448f77..79b9da9ac0 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -489,7 +489,7 @@ filter_part_expand_code (FilterPart *ff, const gchar *source, GString *out)
 		fe = filter_part_find_element (ff, name);
 		d(printf("expand code: looking up variab le '%s' = %p\n", ff, name, fe));
 		if (fe) {
-			g_string_append_printf (out, "%.*s", (int)(newstart-start), start);
+			g_string_append_printf (out, "%.*s", (gint)(newstart-start), start);
 			filter_element_format_sexp (fe, out);
 #if 0
 		} else if ((val = g_hash_table_lookup (ff->globals, name))) {
@@ -497,7 +497,7 @@ filter_part_expand_code (FilterPart *ff, const gchar *source, GString *out)
 			e_sexp_encode_string (out, val);
 #endif
 		} else {
-			g_string_append_printf (out, "%.*s", (int)(end-start+1), start);
+			g_string_append_printf (out, "%.*s", (gint)(end-start+1), start);
 		}
 		start = end + 1;
 	}
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 00610c48ea..354d276fe8 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -203,7 +203,7 @@ filter_rule_validate (FilterRule *fr)
 	return FILTER_RULE_GET_CLASS (fr)->validate (fr);
 }
 
-static int
+static gint
 validate (FilterRule *fr)
 {
 	gint valid = TRUE;
@@ -240,7 +240,7 @@ filter_rule_eq (FilterRule *fr, FilterRule *cm)
 		&& FILTER_RULE_GET_CLASS (fr)->eq (fr, cm);
 }
 
-static int
+static gint
 list_eq(GList *al, GList *bl)
 {
 	gint truth = TRUE;
@@ -256,7 +256,7 @@ list_eq(GList *al, GList *bl)
 	return truth && al == NULL && bl == NULL;
 }
 
-static int
+static gint
 rule_eq (FilterRule *fr, FilterRule *cm)
 {
 	return fr->enabled == cm->enabled
@@ -387,7 +387,7 @@ filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
 	return res;
 }
 
-static int
+static gint
 xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
 {
 	xmlNodePtr work;
diff --git a/filter/rule-context.c b/filter/rule-context.c
index e9dc71a150..5f00adff71 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -295,7 +295,7 @@ rule_context_load(RuleContext *rc, const gchar *system, const gchar *user)
 	return res;
 }
 
-static int
+static gint
 load(RuleContext *rc, const gchar *system, const gchar *user)
 {
 	xmlNodePtr set, rule, root;
@@ -422,7 +422,7 @@ rule_context_save(RuleContext *rc, const gchar *user)
 	return RULE_CONTEXT_GET_CLASS(rc)->save(rc, user);
 }
 
-static int
+static gint
 save(RuleContext *rc, const gchar *user)
 {
 	xmlDocPtr doc;
@@ -507,14 +507,14 @@ source_hashf(const gchar *a)
 	return 0;
 }
 
-static int
+static gint
 source_eqf(const gchar *a, const gchar *b)
 {
 	return((a && b && strcmp(a, b) == 0))
 		|| (a == NULL && b == NULL);
 }
 
-static int
+static gint
 revert(RuleContext *rc, const gchar *user)
 {
 	xmlNodePtr set, rule;
diff --git a/mail/e-mail-shell-migrate.c b/mail/e-mail-shell-migrate.c
index 147cce01a4..5ebc833902 100644
--- a/mail/e-mail-shell-migrate.c
+++ b/mail/e-mail-shell-migrate.c
@@ -97,7 +97,7 @@ emm_load_xml (const gchar *dirname, const gchar *filename)
 	return doc;
 }
 
-static int
+static gint
 emm_save_xml (xmlDocPtr doc, const gchar *dirname, const gchar *filename)
 {
 	gchar *path;
@@ -1189,7 +1189,7 @@ em_migrate_set_progress (double percent)
 {
 	gchar text[5];
 
-	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
+	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
 
 	gtk_progress_bar_set_fraction (progress, percent);
 	gtk_progress_bar_set_text (progress, text);
@@ -1370,9 +1370,9 @@ static gboolean
 cp (const gchar *src, const gchar *dest, gboolean show_progress, gint mode)
 {
 	guchar readbuf[65536];
-	ssize_t nread, nwritten;
+	gssize nread, nwritten;
 	gint errnosav, readfd, writefd;
-	size_t total = 0;
+	gsize total = 0;
 	struct stat st;
 	struct utimbuf ut;
 
@@ -1453,7 +1453,7 @@ cp_r (const gchar *src, const gchar *dest, const gchar *pattern, gint mode)
 {
 	GString *srcpath, *destpath;
 	struct dirent *dent;
-	size_t slen, dlen;
+	gsize slen, dlen;
 	struct stat st;
 	DIR *dir;
 
@@ -1568,7 +1568,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *
 	/* Manually copy local mbox files, its much faster */
 	if (!strncmp (uri, "mbox:", 5)) {
 		static const gchar *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" };
-		size_t slen, dlen;
+		gsize slen, dlen;
 		FILE *fp;
 		gchar *p;
 		gint mode;
@@ -2000,7 +2000,7 @@ em_migrate_pop_uid_caches_1_4 (const gchar *data_dir, GError **error)
 {
 	GString *oldpath, *newpath;
 	struct dirent *dent;
-	size_t olen, nlen;
+	gsize olen, nlen;
 	gchar *cache_dir;
 	DIR *dir;
 	gboolean success = TRUE;
@@ -2109,7 +2109,7 @@ static gboolean
 em_migrate_folder_expand_state_1_4 (const gchar *data_dir, GError **error)
 {
 	GString *srcpath, *destpath;
-	size_t slen, dlen, rlen;
+	gsize slen, dlen, rlen;
 	gchar *evo14_mbox_root;
 	struct dirent *dent;
 	struct stat st;
@@ -2207,7 +2207,7 @@ static gboolean
 em_migrate_folder_view_settings_1_4 (const gchar *data_dir, GError **error)
 {
 	GString *srcpath, *destpath;
-	size_t slen, dlen, rlen;
+	gsize slen, dlen, rlen;
 	gchar *evo14_mbox_root;
 	struct dirent *dent;
 	struct stat st;
@@ -2243,7 +2243,7 @@ em_migrate_folder_view_settings_1_4 (const gchar *data_dir, GError **error)
 	while ((dent = readdir (dir))) {
 		gchar *full_name, *inptr, *buf = NULL;
 		const gchar *filename, *ext;
-		size_t prelen = 0;
+		gsize prelen = 0;
 		GString *new;
 
 		if (dent->d_name[0] == '.')
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c
index 277e80ca19..ed4a01c4c5 100644
--- a/mail/e-searching-tokenizer.c
+++ b/mail/e-searching-tokenizer.c
@@ -97,7 +97,7 @@ loop:
 static const gchar *ignored_tags[] = {
 	"B", "I", "FONT", "TT", "EM", /* and more? */};
 
-static int
+static gint
 ignore_tag (const gchar *tag)
 {
 	gchar *t = alloca(strlen(tag)+1), c, *out;
@@ -533,7 +533,7 @@ output_match(struct _searcher *s, guint start, guint end)
 
 	/* output highlight/bold */
 	if (s->flags & SEARCH_BOLD) {
-		sprintf(b, "%c<b>", (char)TAG_ESCAPE);
+		sprintf(b, "%c<b>", (gchar)TAG_ESCAPE);
 		append_token(&s->output, b, -1);
 	}
 	if (s->tags)
@@ -561,7 +561,7 @@ output_match(struct _searcher *s, guint start, guint end)
 
 	/* and close bold if we need to */
 	if (s->flags & SEARCH_BOLD) {
-		sprintf(b, "%c</b>", (char)TAG_ESCAPE);
+		sprintf(b, "%c</b>", (gchar)TAG_ESCAPE);
 		append_token(&s->output, b, -1);
 	}
 }
@@ -578,7 +578,7 @@ output_subpending (struct _searcher *s)
 }
 
 /* returns true if a merge took place */
-static int
+static gint
 merge_subpending (struct _searcher *s, gint offstart, gint offend)
 {
 	gint i;
@@ -771,7 +771,7 @@ searcher_peek_token(struct _searcher *s)
 	return tok;
 }
 
-static int
+static gint
 searcher_pending (struct _searcher *s)
 {
 	return !(e_dlist_empty(&s->input) && e_dlist_empty(&s->output));
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 27c04c83fb..99938fadce 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -618,7 +618,7 @@ emae_signature_added(ESignatureList *signatures, ESignature *sig, EMAccountEdito
 	gtk_combo_box_set_active(emae->priv->signatures_dropdown, gtk_tree_model_iter_n_children(model, NULL)-1);
 }
 
-static int
+static gint
 emae_signature_get_iter(EMAccountEditor *emae, ESignature *sig, GtkTreeModel **modelp, GtkTreeIter *iter)
 {
 	GtkTreeModel *model;
@@ -1245,7 +1245,7 @@ emae_path_changed(GtkWidget *widget, EMAccountEditorService *service)
 	emae_service_url_path_changed(service, camel_url_set_path, widget);
 }
 
-static int
+static gint
 emae_ssl_update(EMAccountEditorService *service, CamelURL *url)
 {
 	gint id = gtk_combo_box_get_active(service->use_ssl);
@@ -2747,7 +2747,7 @@ struct _server_prefill {
 	{"msn", "pop3.email.msn.com", "smtp.email.msn.com", "pop", "never"}
 };
 
-static int
+static gint
 check_servers (gchar *server)
 {
 	gint len = G_N_ELEMENTS(mail_servers), i;
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 67d26f440d..74438b2043 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1106,7 +1106,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 		flags |= EM_FORMAT_QUOTE_CITE;
 
 	for (i = 0; i < messages->len; i++) {
-		ssize_t len;
+		gssize len;
 
 		message = messages->pdata[i];
 		subject = mail_tool_generate_forward_subject (message);
@@ -2214,7 +2214,7 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat *
 	gchar *text, *credits;
 	CamelMimePart *part;
 	GConfClient *gconf;
-	ssize_t len = 0;
+	gssize len = 0;
 	gboolean start_bottom;
 
 	gconf = mail_config_get_gconf_client ();
@@ -2273,7 +2273,7 @@ gchar *
 em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source)
 {
 	gchar *text, *credits;
-	ssize_t len = 0;
+	gssize len = 0;
 	gboolean start_bottom = 0;
 
 	credits = attribution_format (ATTRIBUTION, message);
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index 1e1f1495f9..145240dfbb 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -157,7 +157,7 @@ validate(FilterElement *fe)
 	}
 }
 
-static int
+static gint
 folder_eq(FilterElement *fe, FilterElement *cm)
 {
         return FILTER_ELEMENT_CLASS(parent_class)->eq(fe, cm)
@@ -192,7 +192,7 @@ xml_encode(FilterElement *fe)
 	return value;
 }
 
-static int
+static gint
 xml_decode(FilterElement *fe, xmlNodePtr node)
 {
 	EMFilterFolderElement *ff = (EMFilterFolderElement *)fe;
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 03d0028b6e..47c5e4d0d2 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -171,7 +171,7 @@ em_filter_rule_build_action(EMFilterRule *fr, GString *out)
 	g_string_append(out, ")\n");
 }
 
-static int
+static gint
 validate(FilterRule *fr)
 {
 	EMFilterRule *ff =(EMFilterRule *)fr;
@@ -190,7 +190,7 @@ validate(FilterRule *fr)
 	return valid;
 }
 
-static int
+static gint
 list_eq(GList *al, GList *bl)
 {
 	gint truth = TRUE;
@@ -206,7 +206,7 @@ list_eq(GList *al, GList *bl)
 	return truth && al == NULL && bl == NULL;
 }
 
-static int
+static gint
 filter_eq(FilterRule *fr, FilterRule *cm)
 {
         return FILTER_RULE_CLASS(parent_class)->eq(fr, cm)
@@ -262,7 +262,7 @@ load_set(xmlNodePtr node, EMFilterRule *ff, RuleContext *rc)
 	}
 }
 
-static int
+static gint
 xml_decode(FilterRule *fr, xmlNodePtr node, RuleContext *rc)
 {
 	EMFilterRule *ff =(EMFilterRule *)fr;
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 126cbe2a50..1fd5a518ad 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -151,7 +151,7 @@ em_filter_source_element_new(void)
 	return (EMFilterSourceElement *)g_object_new(em_filter_source_element_get_type(), NULL, NULL);
 }
 
-static int
+static gint
 source_eq(FilterElement *fe, FilterElement *cm)
 {
 	EMFilterSourceElement *fs = (EMFilterSourceElement *)fe, *cs = (EMFilterSourceElement *)cm;
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index cd3f35df0a..f1c8bdc72f 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -575,7 +575,7 @@ static MailMsgInfo vfolder_setup_info = {
 };
 
 /* sources_uri should be camel uri's */
-static int
+static gint
 vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder, CamelOperation *cancel)
 {
 	struct _setup_msg *m;
@@ -610,8 +610,8 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
 	CamelFolder *folder;
 	CamelStore *store;
 	GPtrArray *folders;
-	GList *folder_list_account = NULL ;
-	GList *l, *folder_list = NULL ;
+	GList *folder_list_account = NULL;
+	GList *l, *folder_list = NULL;
 	CamelException *ex;
 	ex = camel_exception_new ();
 
@@ -1054,7 +1054,7 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act)
 		EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
 
 		/* Stop button */
-		state = mail_msg_active((unsigned int)-1);
+		state = mail_msg_active((guint)-1);
 		bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", state?"1":"0", NULL);
 
 //		/* HideDeleted */
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index b4e239e36b..70cdf88350 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -127,7 +127,7 @@ emfp_free(EConfig *ec, GSList *items, gpointer data)
 	g_free (prop_data);
 }
 
-static int
+static gint
 add_numbered_row (GtkTable *table, gint row, const gchar *description, const gchar *format, gint num)
 {
 	gchar *str;
@@ -198,7 +198,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 			else
 				descr = g_strdup_printf (_("Quota usage"));
 
-			procs = (int) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5);
+			procs = (gint) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5);
 
 			row = add_numbered_row (GTK_TABLE (table), row, descr, "%d%%", procs);
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index b1ee7eff2d..adc77fdbfe 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -138,7 +138,7 @@ folder_tree_model_load_state (EMFolderTreeModel *model,
 	xmlSetProp (node, (const guchar *)"expand", (const guchar *)"true");
 }
 
-static int
+static gint
 folder_tree_model_sort (GtkTreeModel *model,
                         GtkTreeIter *a,
                         GtkTreeIter *b,
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index a98b1c9ed8..65fdf8f726 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -597,7 +597,7 @@ emft_expand_node (EMFolderTreeModel *model, const gchar *key, EMFolderTree *emft
 	CamelStore *store;
 	const gchar *p;
 	gchar *uid;
-	size_t n;
+	gsize n;
 	struct _selected_uri *u;
 
 	if (!(p = strchr (key, '/')))
@@ -1374,7 +1374,7 @@ tree_autoscroll (EMFolderTree *emft)
 	GdkRectangle rect;
 	GdkWindow *window;
 	gint offset, y;
-	float value;
+	gfloat value;
 
 	/* get the y pointer position relative to the treeview */
 	tree_view = GTK_TREE_VIEW (emft);
@@ -2027,7 +2027,7 @@ emft_tree_button_press (GtkTreeView *treeview, GdkEventButton *event, EMFolderTr
 	if (event->button != 3 && !(event->button == 1 && event->type == GDK_2BUTTON_PRESS))
 		return FALSE;
 
-	if (!gtk_tree_view_get_path_at_pos (treeview, (int) event->x, (int) event->y, &tree_path, NULL, NULL, NULL))
+	if (!gtk_tree_view_get_path_at_pos (treeview, (gint) event->x, (gint) event->y, &tree_path, NULL, NULL, NULL))
 		return FALSE;
 
 	/* select/focus the row that was right-clicked or double-clicked */
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 4ad9378549..f92e8e3115 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -438,7 +438,7 @@ em_folder_utils_rename_folder (CamelFolder *folder)
 	const gchar *p;
 	CamelStore *local_store;
 	gboolean done = FALSE;
-	size_t base_len;
+	gsize base_len;
 
 	local_store = e_mail_shell_backend_get_local_store (global_mail_shell_backend);
 
@@ -450,7 +450,7 @@ em_folder_utils_rename_folder (CamelFolder *folder)
 	}
 
 	if ((p = strrchr (folder->full_name, '/')))
-		base_len = (size_t) (p - folder->full_name);
+		base_len = (gsize) (p - folder->full_name);
 	else
 		base_len = 0;
 
@@ -578,7 +578,7 @@ static MailMsgInfo create_folder_info = {
 };
 
 
-static int
+static gint
 emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data)
 {
 	gchar *name, *namebuf = NULL;
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 71f5a1f037..8bb0c1e336 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -572,7 +572,7 @@ mst_free (struct mst_t *mst)
 	g_free (mst);
 }
 
-static int
+static gint
 do_mark_seen (gpointer user_data)
 {
 	struct mst_t *mst = user_data;
@@ -798,7 +798,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu
 	return des_menu;
 }
 
-static int
+static gint
 emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, CamelMimePart *part, EMFolderView *emfv)
 {
 	GtkMenu *menu = NULL;
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index ad7cbd7144..61cc515684 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -157,7 +157,7 @@ error:
 	return NULL;
 }
 
-static int
+static gint
 emfh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 1991c0d67f..0d1b6c545a 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1153,7 +1153,7 @@ em_format_html_file_part(EMFormatHTML *efh, const gchar *mime_type, const gchar
 /* all this api is a pain in the bum ... */
 
 EMFormatHTMLPObject *
-em_format_html_add_pobject(EMFormatHTML *efh, size_t size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func)
+em_format_html_add_pobject(EMFormatHTML *efh, gsize size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func)
 {
 	EMFormatHTMLPObject *pobj;
 
@@ -1263,7 +1263,7 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled)
 	CamelURL *url;
 	CamelContentType *content_type;
 	CamelHttpStream *tmp_stream;
-	ssize_t n, total = 0, pc_complete = 0, nread = 0;
+	gssize n, total = 0, pc_complete = 0, nread = 0;
 	gchar buffer[1500];
 	const gchar *length;
 
@@ -1822,7 +1822,7 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part
 		s = d = url;
 		while (*s) {
 			/* FIXME: use camel_isspace */
-			if (!isspace ((unsigned char)*s))
+			if (!isspace ((guchar)*s))
 				*d++ = *s;
 			s++;
 		}
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index bcc9a917a9..4f9c0b209b 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -268,7 +268,7 @@ CamelMimePart *	em_format_html_file_part	(EMFormatHTML *efh,
 /* for implementers */
 EMFormatHTMLPObject *
 		em_format_html_add_pobject	(EMFormatHTML *efh,
-						 size_t size,
+						 gsize size,
 						 const gchar *classid,
 						 CamelMimePart *part,
 						 EMFormatHTMLPObjectFunc func);
diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c
index 820e4a83af..cc3c795d32 100644
--- a/mail/em-html-stream.c
+++ b/mail/em-html-stream.c
@@ -56,10 +56,10 @@ emhs_gtkhtml_destroy (GtkHTML *html,
 	emhs_cleanup (emhs);
 }
 
-static ssize_t
+static gssize
 emhs_sync_write (CamelStream *stream,
                  const gchar *buffer,
-                 size_t n)
+                 gsize n)
 {
 	EMHTMLStream *emhs = EM_HTML_STREAM (stream);
 
@@ -72,10 +72,10 @@ emhs_sync_write (CamelStream *stream,
 
 	gtk_html_stream_write (emhs->html_stream, buffer, n);
 
-	return (ssize_t) n;
+	return (gssize) n;
 }
 
-static int
+static gint
 emhs_sync_flush(CamelStream *stream)
 {
 	EMHTMLStream *emhs = (EMHTMLStream *)stream;
@@ -88,7 +88,7 @@ emhs_sync_flush(CamelStream *stream)
 	return 0;
 }
 
-static int
+static gint
 emhs_sync_close (CamelStream *stream)
 {
 	EMHTMLStream *emhs = (EMHTMLStream *)stream;
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index 91dc5e10ca..384d79846f 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -50,7 +50,7 @@ static void em_icon_stream_class_init (EMIconStreamClass *klass);
 static void em_icon_stream_init (CamelObject *object);
 static void em_icon_stream_finalize (CamelObject *object);
 
-static ssize_t emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n);
+static gssize emis_sync_write(CamelStream *stream, const gchar *buffer, gsize n);
 static gint emis_sync_close(CamelStream *stream);
 static gint emis_sync_flush(CamelStream *stream);
 
@@ -132,8 +132,8 @@ em_icon_stream_finalize(CamelObject *object)
 	emis_cleanup(emis);
 }
 
-static ssize_t
-emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n)
+static gssize
+emis_sync_write(CamelStream *stream, const gchar *buffer, gsize n)
 {
 	EMIconStream *emis = EM_ICON_STREAM (stream);
 
@@ -145,10 +145,10 @@ emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n)
 		return -1;
 	}
 
-	return (ssize_t) n;
+	return (gssize) n;
 }
 
-static int
+static gint
 emis_sync_flush(CamelStream *stream)
 {
 	return 0;
@@ -190,7 +190,7 @@ emis_fit(GdkPixbuf *pixbuf, gint maxwidth, gint maxheight, gint *scale)
 	return mini;
 }
 
-static int
+static gint
 emis_sync_close(CamelStream *stream)
 {
 	EMIconStream *emis = (EMIconStream *)stream;
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index e8dab897a0..ddc579b40b 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -40,8 +40,8 @@ static void em_inline_filter_class_init (EMInlineFilterClass *klass);
 static void em_inline_filter_init (CamelObject *object);
 static void em_inline_filter_finalize (CamelObject *object);
 
-static void emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace);
-static void emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace);
+static void emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
+static void emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
 static void emif_reset(CamelMimeFilter *f);
 
 static CamelMimeFilterClass *parent_class = NULL;
@@ -191,8 +191,8 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len)
 	emif->parts = g_slist_append(emif->parts, part);
 }
 
-static int
-emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final)
+static gint
+emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 {
 	EMInlineFilter *emif = (EMInlineFilter *)f;
 	gchar *inptr = in, *inend = in+len;
@@ -335,7 +335,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final)
 }
 
 static void
-emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace)
+emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
 	emif_scan(f, in, len, FALSE);
 
@@ -345,7 +345,7 @@ emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **
 }
 
 static void
-emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace)
+emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
 	emif_scan(f, in, len, TRUE);
 
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index a0a2a205ce..d032823bed 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -267,7 +267,7 @@ error:
 	return NULL;
 }
 
-static int
+static gint
 emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 {
 	xmlNodePtr node;
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 156e7824e0..79648a3170 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -160,7 +160,7 @@ mark_seen_timeout_transform (const GValue *src_value,
 {
 	gdouble v_double;
 
-	/* Shell Settings (int) -> Spin Button (double) */
+	/* Shell Settings (gint) -> Spin Button (double) */
 	v_double = (gdouble) g_value_get_int (src_value);
 	g_value_set_double (dst_value, v_double / 1000.0);
 
@@ -174,7 +174,7 @@ mark_seen_timeout_reverse_transform (const GValue *src_value,
 {
 	gdouble v_double;
 
-	/* Spin Button (double) -> Shell Settings (int) */
+	/* Spin Button (double) -> Shell Settings (gint) */
 	v_double = g_value_get_double (src_value);
 	g_value_set_int (dst_value, v_double * 1000);
 
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index c5fdb54896..8bea632f24 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -246,7 +246,7 @@ static MailMsgInfo sub_subscribe_folder_info = {
 };
 
 /* spath is tree path in string form */
-static int
+static gint
 sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, gint state, const gchar *spath)
 {
 	struct _zsubscribe_msg *m;
@@ -421,7 +421,7 @@ static MailMsgInfo sub_folderinfo_info = {
 	(MailMsgFreeFunc) sub_folderinfo_free
 };
 
-static int
+static gint
 sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node)
 {
 	struct _emse_folderinfo_msg *m;
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 138932cfc7..7e93b33dde 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -138,7 +138,7 @@ emss_stream_write (CamelStream *stream, const gchar *string, gsize len)
 	return (gssize) len;
 }
 
-static int
+static gint
 emss_stream_flush (CamelStream *stream)
 {
 	EMSyncStream *emss = EM_SYNC_STREAM (stream);
@@ -154,7 +154,7 @@ emss_stream_flush (CamelStream *stream)
 	return 0;
 }
 
-static int
+static gint
 emss_stream_close (CamelStream *stream)
 {
 	EMSyncStream *emss = EM_SYNC_STREAM (stream);
diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h
index fc687fa462..16cdc272d1 100644
--- a/mail/em-sync-stream.h
+++ b/mail/em-sync-stream.h
@@ -61,8 +61,8 @@ struct _EMSyncStreamClass {
 	gssize		(*sync_write)		(CamelStream *stream,
 						 const gchar *string,
 						 gsize len);
-	int		(*sync_close)		(CamelStream *stream);
-	int		(*sync_flush)		(CamelStream *stream);
+	gint		(*sync_close)		(CamelStream *stream);
+	gint		(*sync_flush)		(CamelStream *stream);
 };
 
 CamelType	em_sync_stream_get_type		(void);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index c3740d8a70..6617b041d2 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -487,7 +487,7 @@ get_unique_file_names (GSList *parts)
 				/* if we have an extension, then place number before it (at p is ".ext"),
 				   otherwise just append number in brackets */
 				if (p)
-					new_name = g_strdup_printf ("%.*s(%d)%s", (int) (p - name), name, counter, p);
+					new_name = g_strdup_printf ("%.*s(%d)%s", (gint) (p - name), name, counter, p);
 				else
 					new_name = g_strdup_printf ("%s(%d)", name, counter);
 
@@ -969,7 +969,7 @@ em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GP
 
 /* This kind of sucks, because for various reasons most callers need to run synchronously
    in the gui thread, however this could take a long, blocking time, to run */
-static int
+static gint
 em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStream *stream)
 {
 	CamelStreamFilter *filtered_stream;
@@ -1014,7 +1014,7 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr
 
 /* This kind of sucks, because for various reasons most callers need to run synchronously
    in the gui thread, however this could take a long, blocking time, to run */
-static int
+static gint
 em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream)
 {
 	CamelException *ex = camel_exception_new();
@@ -1566,7 +1566,7 @@ em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri)
 void
 em_utils_adjustment_page(GtkAdjustment *adj, gboolean down)
 {
-	float page_size = adj->page_size - adj->step_increment;
+	gfloat page_size = adj->page_size - adj->step_increment;
 
 	if (down) {
 		if (adj->value < adj->upper - adj->page_size - page_size)
@@ -1642,7 +1642,7 @@ em_utils_get_proxy_uri (const gchar *pUri)
  * Return value: The html version.
  **/
 gchar *
-em_utils_message_to_html(CamelMimeMessage *message, const gchar *credits, guint32 flags, ssize_t *len, EMFormat *source, const gchar *append)
+em_utils_message_to_html(CamelMimeMessage *message, const gchar *credits, guint32 flags, gssize *len, EMFormat *source, const gchar *append)
 {
 	EMFormatQuote *emfq;
 	CamelStreamMem *mem;
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 0b413edfce..63056b28f4 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -83,7 +83,7 @@ void em_utils_adjustment_page(GtkAdjustment *adj, gboolean down);
 gchar *em_utils_get_proxy_uri (const gchar *uri);
 
 /* FIXME: should this have an override charset? */
-gchar *em_utils_message_to_html(CamelMimeMessage *msg, const gchar *credits, guint32 flags, ssize_t *len, struct _EMFormat *source, const gchar *append);
+gchar *em_utils_message_to_html(CamelMimeMessage *msg, const gchar *credits, guint32 flags, gssize *len, struct _EMFormat *source, const gchar *append);
 
 void em_utils_expunge_folder (GtkWidget *parent, CamelFolder *folder);
 void em_utils_empty_trash (GtkWidget *parent);
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index c75ef7d7c9..183a4a80aa 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -207,7 +207,7 @@ em_vfolder_rule_next_source(EMVFolderRule *vr, const gchar *last)
 	return NULL;
 }
 
-static int
+static gint
 validate(FilterRule *fr)
 {
 	g_return_val_if_fail(fr != NULL, 0);
@@ -229,7 +229,7 @@ validate(FilterRule *fr)
 	return FILTER_RULE_CLASS(parent_class)->validate(fr);
 }
 
-static int
+static gint
 list_eq(GList *al, GList *bl)
 {
 	gint truth = TRUE;
@@ -245,7 +245,7 @@ list_eq(GList *al, GList *bl)
 	return truth && al == NULL && bl == NULL;
 }
 
-static int
+static gint
 vfolder_eq(FilterRule *fr, FilterRule *cm)
 {
         return FILTER_RULE_CLASS(parent_class)->eq(fr, cm)
@@ -292,7 +292,7 @@ set_with(EMVFolderRule *vr, const gchar *name)
 	vr->with = 0;
 }
 
-static int
+static gint
 xml_decode(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)
 {
 	xmlNodePtr set, work;
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 6e65418441..1c28e2d82d 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -281,7 +281,7 @@ static MailMsgInfo elm_import_info = {
 	(MailMsgFreeFunc) elm_import_free
 };
 
-static int
+static gint
 mail_importer_elm_import(EImport *ei, EImportTarget *target)
 {
 	struct _elm_import_msg *m;
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index e40a1df20c..a9e6b59038 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -237,7 +237,7 @@ import_mbox_exec (struct _import_mbox_msg *m)
 			guint32 flags = 0;
 
 			if (st.st_size > 0)
-				pc = (int)(100.0 * ((double)camel_mime_parser_tell(mp) / (double)st.st_size));
+				pc = (gint)(100.0 * ((double)camel_mime_parser_tell(mp) / (double)st.st_size));
 			camel_operation_progress(NULL, pc);
 
 			msg = camel_mime_message_new();
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 0c5b5fd92e..84c29b24c5 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -109,7 +109,7 @@ import_contact(EBook *book, gchar *line)
 	GList *list;
 	/*EContactName *name;*/
 	EContact *card;
-	size_t len;
+	gsize len;
 
 	card = e_contact_new();
 	strings = g_strsplit(line, "\t", 5);
@@ -168,7 +168,7 @@ import_contacts(void)
 	gchar *name;
 	GString *line;
 	FILE *fp;
-	size_t offset;
+	gsize offset;
 
 	printf("importing pine addressbook\n");
 
@@ -197,7 +197,7 @@ import_contacts(void)
 	g_string_set_size(line, 256);
 	offset = 0;
 	while (fgets(line->str+offset, 256, fp)) {
-		size_t len;
+		gsize len;
 
 		len = strlen(line->str+offset)+offset;
 		if (line->str[len-1] == '\n')
@@ -324,7 +324,7 @@ static MailMsgInfo pine_import_info = {
 	(MailMsgFreeFunc) pine_import_free
 };
 
-static int
+static gint
 mail_importer_pine_import(EImport *ei, EImportTarget *target)
 {
 	struct _pine_import_msg *m;
diff --git a/mail/mail-component.c b/mail/mail-component.c
index e236682052..176a6cb875 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -427,7 +427,7 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev)
 		/* Falls through */
 	case MC_QUIT_THREADS:
 		/* should we keep cancelling? */
-		if (mail_msg_active((unsigned int)-1))
+		if (mail_msg_active((guint)-1))
 			return FALSE;
 
 		mail_session_shutdown ();
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 0d8a3e6336..9125e94a14 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -729,7 +729,7 @@ get_folders(CamelFolderInfo *fi, GPtrArray *folders)
 	}
 }
 
-static int
+static gint
 folder_cmp(gconstpointer ap, gconstpointer bp)
 {
 	const CamelFolderInfo *a = ((CamelFolderInfo **)ap)[0];
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index b4572281f4..4920ab9e80 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -384,7 +384,7 @@ gint mail_msg_active(guint msgid)
 	gint active;
 
 	MAIL_MT_LOCK(mail_msg_lock);
-	if (msgid == (unsigned int)-1)
+	if (msgid == (guint)-1)
 		active = g_hash_table_size(mail_msg_active_table) > 0;
 	else
 		active = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)) != NULL;
@@ -688,7 +688,7 @@ do_async_event(struct _proxy_msg *m)
 	g_mutex_unlock(m->ea->lock);
 }
 
-static int
+static gint
 idle_async_event(gpointer mm)
 {
 	do_async_event(mm);
@@ -831,7 +831,7 @@ do_call(struct _call_msg *m)
 	case MAIL_CALL_p_ppippp:
 		p1 = va_arg(ap, gpointer );
 		p2 = va_arg(ap, gpointer );
-		i1 = va_arg(ap, int);
+		i1 = va_arg(ap, gint);
 		p3 = va_arg(ap, gpointer );
 		p4 = va_arg(ap, gpointer );
 		p5 = va_arg(ap, gpointer );
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index aa1f1afec0..03775c74d1 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -97,7 +97,7 @@ typedef enum {
 	SEND_SEND,		/* sender */
 	SEND_UPDATE,		/* imap-like 'just update folder info' */
 	SEND_INVALID
-} send_info_t ;
+} send_info_t;
 
 typedef enum {
 	SEND_ACTIVE,
@@ -259,7 +259,7 @@ dialog_response(GtkDialog *gd, gint button, struct _send_data *data)
 	}
 }
 
-static int
+static gint
 operation_status_timeout(gpointer data)
 {
 	struct _send_info *info = data;
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index bc8a3fd3ec..67407ae81f 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -115,7 +115,7 @@ mail_tool_get_local_movemail_path (const guchar *uri, CamelException *ex)
 
 	safe_uri = (guchar *)g_strdup ((const gchar *)uri);
 	for (c = safe_uri; *c; c++)
-		if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((int) *c))
+		if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((gint) *c))
 			*c = '_';
 
 	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index d2952cdfe5..c018b9eea9 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -171,7 +171,7 @@ static MailMsgInfo vfolder_setup_info = {
 };
 
 /* sources_uri should be camel uri's */
-static int
+static gint
 vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder)
 {
 	struct _setup_msg *m;
@@ -302,7 +302,7 @@ static MailMsgInfo vfolder_adduri_info = {
 
 
 /* uri should be a camel uri */
-static int
+static gint
 vfolder_adduri(const gchar *uri, GList *folders, gint remove)
 {
 	struct _adduri_msg *m;
@@ -333,7 +333,7 @@ mv_find_folder(GList *l, CamelStore *store, const gchar *uri)
 }
 
 /* uri is a camel uri */
-static int
+static gint
 uri_is_ignore(CamelStore *store, const gchar *uri)
 {
 	EAccountList *accounts;
@@ -396,7 +396,7 @@ uri_is_ignore(CamelStore *store, const gchar *uri)
 }
 
 /* so special we never use it */
-static int
+static gint
 uri_is_spethal(CamelStore *store, const gchar *uri)
 {
 	CamelURL *url;
diff --git a/mail/message-list.c b/mail/message-list.c
index 1291a1404c..d28e9a9d0e 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -297,7 +297,7 @@ e_mail_address_free (EMailAddress *addr)
 /* Note: by the time this function is called, the strings have already
    been normalised which means we can assume all lowercase chars and
    we can just use strcmp for the final comparison. */
-static int
+static gint
 e_mail_address_compare (gconstpointer address1, gconstpointer address2)
 {
 	const EMailAddress *addr1 = address1;
@@ -359,7 +359,7 @@ e_mail_address_compare (gconstpointer address1, gconstpointer address2)
 /* Note: by the time this function is called, the strings have already
    been normalised which means we can assume all lowercase chars and
    we can just use strcmp for the final comparison. */
-static int
+static gint
 address_compare (gconstpointer address1, gconstpointer address2)
 {
 #ifdef SMART_ADDRESS_COMPARE
@@ -479,12 +479,12 @@ get_normalised_string (MessageList *message_list, CamelMessageInfo *info, gint c
 			subject += 3;
 
 			/* jump over any spaces */
-			while (*subject && isspace ((int) *subject))
+			while (*subject && isspace ((gint) *subject))
 				subject++;
 		}
 
 		/* jump over any spaces */
-		while (*subject && isspace ((int) *subject))
+		while (*subject && isspace ((gint) *subject))
 			subject++;
 
 		string = (const gchar *) subject;
@@ -865,7 +865,7 @@ message_list_paste(MessageList *ml)
 /*
  * SimpleTableModel::col_count
  */
-static int
+static gint
 ml_column_count (ETreeModel *etm, gpointer data)
 {
 	return COL_LAST;
@@ -1140,7 +1140,7 @@ ml_tree_icon_at (ETreeModel *etm, ETreePath path, gpointer model_data)
 }
 
 /* return true if there are any unread messages in the subtree */
-static int
+static gint
 subtree_unread(MessageList *ml, ETreePath node)
 {
 	CamelMessageInfo *info;
@@ -1235,7 +1235,7 @@ sanitize_recipients (const gchar *string)
 	return g_string_free (recipients, FALSE);
 }
 
-static int
+static gint
 get_all_labels (MessageList *message_list,
                 CamelMessageInfo *msg_info,
                 gchar **label_str,
@@ -1384,7 +1384,7 @@ get_trimmed_subject (CamelMessageInfo *info)
 			subject += 3;
 
 			/* jump over any spaces */
-			while (*subject && isspace ((int) *subject))
+			while (*subject && isspace ((gint) *subject))
 				subject++;
 		}
 
@@ -1396,13 +1396,13 @@ get_trimmed_subject (CamelMessageInfo *info)
 			found_mlist = TRUE;
 
 			/* jump over any spaces */
-			while (*subject && isspace ((int) *subject))
+			while (*subject && isspace ((gint) *subject))
 				subject++;
 		}
 	} while (found_mlist);
 
 	/* jump over any spaces */
-	while (*subject && isspace ((int) *subject))
+	while (*subject && isspace ((gint) *subject))
 		subject++;
 
 	return subject;
@@ -3017,7 +3017,7 @@ build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, gint
 
 /* compares a thread tree node with the etable tree node to see if they point to
    the same object */
-static int
+static gint
 node_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp)
 {
 	CamelMessageInfo *info;
@@ -3032,7 +3032,7 @@ node_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp)
 
 #ifndef BROKEN_ETREE
 /* debug function - compare the two trees to see if they are the same */
-static int
+static gint
 tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp)
 {
 	CamelMessageInfo *info;
@@ -3157,7 +3157,7 @@ build_subtree_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolde
 				gpointer olduid, oldrow;
 				/* if this is a message row, check/update the row id map */
 				if (g_hash_table_lookup_extended(ml->uid_rowmap, camel_message_info_uid(bp->message), &olduid, &oldrow)) {
-					if ((int)oldrow != (*row)) {
+					if ((gint)oldrow != (*row)) {
 						g_hash_table_insert(ml->uid_rowmap, olduid, (gpointer)(*row));
 					}
 				} else {
@@ -3900,7 +3900,7 @@ message_list_ensure_message (MessageList *ml, const gchar *uid)
 }
 
 /* returns the number of messages displayable *after* expression hiding has taken place */
-unsigned int
+guint
 message_list_length (MessageList *ml)
 {
 	return ml->hide_unhidden;
@@ -3928,7 +3928,7 @@ glib_crapback(gpointer key, gpointer data, gpointer x)
 }
 
 /* returns 0 or 1 depending if there are hidden messages */
-unsigned int
+guint
 message_list_hidden(MessageList *ml)
 {
 	guint hidden = 0;
@@ -3991,7 +3991,7 @@ message_list_hide_uids (MessageList *ml, GPtrArray *uids)
 
 			uid =  e_mempool_strdup (ml->hidden_pool, uids->pdata[i]);
 			g_hash_table_insert (ml->hidden, uid, uid);
-			for ( ; i < uids->len; i++) {
+			for (; i < uids->len; i++) {
 				if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) {
 					uid =  e_mempool_strdup (ml->hidden_pool, uids->pdata[i]);
 					g_hash_table_insert (ml->hidden, uid, uid);
@@ -4657,7 +4657,7 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca
 }
 
 
-double
+gdouble
 message_list_get_scrollbar_position (MessageList *ml)
 {
 	return gtk_range_get_value ((GtkRange *) ((GtkScrolledWindow *) ml)->vscrollbar);
diff --git a/mail/message-list.h b/mail/message-list.h
index 47d3708b5e..6c5dcf60cb 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -240,7 +240,7 @@ void	       message_list_ensure_message (MessageList *ml, const gchar *uid);
 
 void           message_list_save_state (MessageList *ml);
 
-double         message_list_get_scrollbar_position (MessageList *ml);
+gdouble         message_list_get_scrollbar_position (MessageList *ml);
 void           message_list_set_scrollbar_position (MessageList *ml, double pos);
 
 #define MESSAGE_LIST_LOCK(m, l) g_mutex_lock(((MessageList *)m)->l)
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 994bbe3214..9959f99142 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -212,7 +212,7 @@ completed_toggled (GtkToggleButton *button, gpointer user_data)
 		followup->completed_date = 0;
 }
 
-static int
+static gint
 get_week_start_day (void)
 {
 	GConfClient *gconf;
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 76d19a9929..d28f24a8d4 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -90,7 +90,7 @@ replace_at_sign (const gchar *str)
 
 	res = g_strdup (str);
 	while (at = strchr (res, '@'), at) {
-		gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2));
+		gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (res) + 2));
 
 		strncpy (tmp, res, at - res);
 		strcat (tmp, "%40");
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index e43d3b0531..f9f7bd7d40 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -391,7 +391,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	uri_text = e_source_get_uri (source);
 	if (uri_text && strncmp (uri_text, "exchange", 8)) {
 		g_free (uri_text);
-		return ;
+		return;
 	}
 
 	status = exchange_is_offline (&offline_status);
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index c898f1b4c5..4e10acabdd 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -207,7 +207,7 @@ set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type,
 		return;
 	physical_uri = e_folder_get_physical_uri (folder);
 
-	/* remove ; form the uri */
+	/* remove; form the uri */
 	camel_url = camel_url_new (physical_uri, NULL);
 	url_string = camel_url_to_string (camel_url, CAMEL_URL_HIDE_ALL);
 	camel_url_free (camel_url);
@@ -311,7 +311,7 @@ add_account_esources (ExchangeAccount *account,
 	    !e_source_list_add_group (tasks_source_list, tasks_source_group, -1)) {
 		goto done;
 	}
-	for ( ; folders != NULL ; folders = g_slist_next (folders)) {
+	for (; folders != NULL; folders = g_slist_next (folders)) {
 		/* Create source for each folder and add to the group */
 
 		folder = folders->data;
@@ -537,7 +537,7 @@ remove_account_esource (ExchangeAccount *account,
 	groups = e_source_list_peek_groups (source_list);
 	found_group = FALSE;
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
@@ -545,7 +545,7 @@ remove_account_esource (ExchangeAccount *account,
                     strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				source = E_SOURCE (sources->data);
 				source_uid = e_source_peek_uid (source);
 
@@ -1193,7 +1193,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 
 	groups = e_source_list_peek_groups (c_source_list);
 
-	for ( ; groups != NULL; groups = g_slist_next (groups)) {
+	for (; groups != NULL; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 		if (!strcmp (e_source_group_peek_name (group), old_name)) {
 			e_source_group_set_name (group, new_name);
@@ -1203,7 +1203,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 
 	groups = e_source_list_peek_groups (t_source_list);
 
-	for ( ; groups != NULL; groups = g_slist_next (groups)) {
+	for (; groups != NULL; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 		if (!strcmp (e_source_group_peek_name (group), old_name)) {
 			e_source_group_set_name (group, new_name);
@@ -1213,7 +1213,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 
 	groups = e_source_list_peek_groups (a_source_list);
 
-	for ( ; groups != NULL; groups = g_slist_next (groups)) {
+	for (; groups != NULL; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 		if (!strcmp (e_source_group_peek_name (group), old_name)) {
 			e_source_group_set_name (group, new_name);
@@ -1252,7 +1252,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 	sl = e_source_list_new_for_gconf (gc_client, CONF_KEY_CONTACTS);
 	groups = e_source_list_peek_groups (sl);
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
@@ -1260,7 +1260,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 		    strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *absolute_uri;
 
@@ -1372,7 +1372,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
 	groups = e_source_list_peek_groups (source_list);
 	found_group = FALSE;
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
@@ -1380,7 +1380,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
                     strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				source = E_SOURCE (sources->data);
 				source_uid = e_source_peek_uid (source);
 
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index b4ef8c43ad..5ecc02e0b1 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -472,7 +472,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data)
 			    -1);
 }
 
-static int
+static gint
 get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter)
 {
 	GtkTreeSelection *selection;
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index 03d7ac7aa9..7113ef8e64 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -181,7 +181,7 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target)
 	if (! g_strrstr (target->uri, "exchange://") ||
 	    !exchange_account_get_folder (account, fixed_path)) {
 		g_free (fixed_path);
-		return ;
+		return;
 	}
 
 	g_free (fixed_path);
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 9537f592a3..87f851a8c8 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -185,8 +185,8 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 	e_msg_composer_set_send_options (composer, TRUE);
 	/*disply the send options dialog*/
 	if (!dialog) {
-		g_print ("New dialog\n\n") ;
-		dialog = exchange_sendoptions_dialog_new () ;
+		g_print ("New dialog\n\n");
+		dialog = exchange_sendoptions_dialog_new ();
 	}
 	exchange_sendoptions_dialog_run (dialog, GTK_WIDGET (composer));
 	g_signal_connect (dialog, "sod_response", G_CALLBACK (append_to_header), GTK_WIDGET (composer));
diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h
index 5de844ba7f..3b4518f5fa 100644
--- a/plugins/exchange-operations/exchange-operations.h
+++ b/plugins/exchange-operations/exchange-operations.h
@@ -46,7 +46,7 @@ ExchangeConfigListenerStatus exchange_is_offline (gint *mode);
 gboolean exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize);
 
 gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri);
-void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection) ;
+void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection);
 
 void exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result);
 
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index e44056abb8..cc707ab65e 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -87,7 +87,7 @@ static guint signals[LAST_SIGNAL] = {0};
 /* exchange_send_options_get_widgets_data(ExchangeSendOptionsDialog *sod)
    Return Value:This function returns a -1 if an error occurs. In case of error-free operation a 1 is returned.
 */
-static int
+static gint
 exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 {
 	ExchangeSendOptionsDialogPrivate *priv;
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index 8a6d37d947..f41ac85371 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -63,7 +63,7 @@ typedef struct {
 	const gchar *delegate_name;
 	const gchar *delegate_email;
 	const gchar *delegate_address;
-} ExchangeSendOptions ;
+} ExchangeSendOptions;
 
 struct _ExchangeSendOptionsDialog {
 	GObject object;
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 10cfdb4fd6..5d8ae3bfcd 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -228,7 +228,7 @@ async_external_editor (EMsgComposer *composer)
 		g_idle_add ((GSourceFunc) run_error_dialog,
 			    "org.gnome.evolution.plugins.external-editor:no-temp-file");
 		g_idle_add ((GSourceFunc) enable_composer, composer);
-		return ;
+		return;
 	}
 
 	gconf = gconf_client_get_default ();
@@ -253,7 +253,7 @@ async_external_editor (EMsgComposer *composer)
 
 		g_free (filename);
 		g_free (editor_cmd_line);
-		return ;
+		return;
 	}
 	g_free (editor_cmd_line);
 
@@ -264,7 +264,7 @@ async_external_editor (EMsgComposer *composer)
 #endif
 		d(printf ("\n\nsome problem here with external editor\n\n"));
 		g_idle_add ((GSourceFunc) enable_composer, composer);
-		return ;
+		return;
 	} else {
 		gchar *buf;
 
@@ -294,7 +294,7 @@ static void launch_editor (GtkAction *action, EMsgComposer *composer)
 
 	if (editor_running()) {
 		d(printf("not opening editor, because it's still running\n"));
-		return ;
+		return;
 	}
 
 	disable_composer (composer);
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 93b4ee9876..d475bf8036 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -137,7 +137,7 @@ sanitize_user_mail (const gchar *user)
 	if (!is_email (user)) {
 		return g_strconcat (user, "%40gmail.com", NULL);
 	} else {
-		gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (user) + 2));
+		gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2));
 		gchar *at = strchr (user, '@');
 
 		strncpy (tmp, user, at - user);
@@ -183,7 +183,7 @@ is_default_uri (const gchar *given_uri, const gchar *username)
 		res = g_ascii_strcasecmp (given_uri, uri) == 0;
 	else {
 		const gchar *last;
-		gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (given_uri) + (2 * ats)));
+		gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (given_uri) + (2 * ats)));
 
 		last = given_uri;
 		for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) {
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 99679ebd18..a86eeaae9e 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -106,7 +106,7 @@ finalize (GObject *object)
 		g_free (config_listener->priv);
 	}
 
-	for ( list = g_list_first (groupwise_accounts); list ; list = g_list_next (list) ) {
+	for ( list = g_list_first (groupwise_accounts); list; list = g_list_next (list) ) {
 
 		info = (GwAccountInfo *) (list->data);
 
@@ -142,7 +142,7 @@ static GwAccountInfo*
 lookup_account_info (const gchar *key)
 {
 	GList *list;
-        GwAccountInfo *info ;
+        GwAccountInfo *info;
 	gint found = 0;
 
         if (!key)
@@ -175,7 +175,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info,  const gchar *source_na
 	ESourceGroup *group;
 	ESource *source;
         GConfClient* client;
-	GSList *ids, *temp ;
+	GSList *ids, *temp;
 	const gchar *source_selection_key;
 	gchar *relative_uri;
 	const gchar *soap_port;
@@ -282,14 +282,14 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 
 	found_group = FALSE;
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), group_name) == 0 &&
 		   strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
 
@@ -363,14 +363,14 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun
 
 	found_group = FALSE;
 
-	for ( ; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 &&
 		    strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for ( ; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
 
@@ -697,7 +697,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 
 	url = camel_url_new (account->source->url, NULL);
 	if (url == NULL)
-		return ;
+		return;
 	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
@@ -715,7 +715,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 		delete_group = TRUE;
 	group = NULL;
 	found_group = FALSE;
-	for ( ; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 
 		group = E_SOURCE_GROUP (groups->data);
 		if ( strcmp ( e_source_group_peek_base_uri(group), old_base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) {
@@ -782,7 +782,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 
 	found_group = FALSE;
 
-	for ( ; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 
 		group = E_SOURCE_GROUP (groups->data);
 		if ( strcmp ( e_source_group_peek_base_uri (group), base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) {
@@ -994,13 +994,13 @@ camel_gw_listener_construct (CamelGwListener *config_listener)
 {
 	EIterator *iter;
 	EAccount *account;
-	GwAccountInfo *info ;
+	GwAccountInfo *info;
 
 	prune_proxies ();
 
 	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
 
-	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
+	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) {
 
 		account = E_ACCOUNT (e_iterator_get (iter));
 
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index 549c75da61..8899b17653 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -55,14 +55,14 @@ set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gc
         list = e_source_list_new_for_gconf (client, path);
 	groups = e_source_list_peek_groups (list);
 
-	for ( ; groups != NULL; groups = g_slist_next (groups)) {
+	for (; groups != NULL; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), name) == 0 &&
 		    strcmp (e_source_group_peek_base_uri (group), GROUPWISE_BASE_URI) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for ( ; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 
 				if (a->source->auto_check) {
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index ae0c5e1e8a..4ee5af017e 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -43,7 +43,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 	if (strncmp (uri_text, "groupwise", 9)) {
 		g_free (uri_text);
 
-		return ;
+		return;
 	}
 	e_source_set_property (source, "auth-domain", "Groupwise");
 	relative_uri = g_strconcat (";", e_source_peek_name (source), NULL);
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index dc13fad256..68cbaf6f9d 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -132,7 +132,7 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t)
 	static gint first = 0;
 
 	if (! g_strrstr (t->uri, "groupwise://"))
-		return ;
+		return;
 
 	/* for translation*/
 	if (!first) {
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index cc735feee1..23c3820130 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -142,11 +142,11 @@ find_node(GList *list, gchar *match)
 	JunkEntry *one_entry = NULL;
 	EGwJunkEntry *ent = NULL;
 	GList *tmp;
-	gint i ;
+	gint i;
 
 	if(list){
 		tmp = g_list_first(list);
-		for(i=0; tmp  ; i++)
+		for(i=0; tmp; i++)
 		{
 			one_entry = tmp->data;
 			ent = one_entry->entry;
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 7007ba5760..9e2920d6ab 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -115,5 +115,5 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t)
 
 		e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder);
 	}
-	return ;
+	return;
 }
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 05b3452091..05d22bedce 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -41,7 +41,7 @@
 
 #include "misc/e-send-options.h"
 
-static ESendOptionsDialog * dialog = NULL ;
+static ESendOptionsDialog * dialog = NULL;
 
 void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
 
@@ -69,12 +69,12 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 	if (state == GTK_RESPONSE_OK) {
 		if (dialog->data->gopts->reply_enabled) {
 			if (dialog->data->gopts->reply_convenient)
-				e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ) ;
+				e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" );
 			else if (dialog->data->gopts->reply_within) {
 				time_t t;
 				t = add_day_to_time (time (NULL), dialog->data->gopts->reply_within);
 				strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t));
-				e_msg_composer_add_header (comp, X_REPLY_WITHIN , value) ;
+				e_msg_composer_add_header (comp, X_REPLY_WITHIN , value);
 			}
 		}
 
@@ -83,33 +83,33 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 				time_t t;
 				t = add_day_to_time (time (NULL), dialog->data->gopts->expire_after);
 				strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t));
-				e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value) ;
+				e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value);
 			}
 		}
 		if (dialog->data->gopts->delay_enabled) {
 			strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&dialog->data->gopts->delay_until));
-			e_msg_composer_add_header (comp, X_DELAY_UNTIL, value) ;
+			e_msg_composer_add_header (comp, X_DELAY_UNTIL, value);
 		}
 
 		/*Status Tracking Options*/
 		if (dialog->data->sopts->tracking_enabled) {
-			temp = g_strdup_printf ("%d",dialog->data->sopts->track_when) ;
-			e_msg_composer_add_header (comp, X_TRACK_WHEN, temp) ;
-			g_free (temp) ;
+			temp = g_strdup_printf ("%d",dialog->data->sopts->track_when);
+			e_msg_composer_add_header (comp, X_TRACK_WHEN, temp);
+			g_free (temp);
 		}
 
 		if (dialog->data->sopts->autodelete) {
-			e_msg_composer_add_header (comp, X_AUTODELETE, "1") ;
+			e_msg_composer_add_header (comp, X_AUTODELETE, "1");
 		}
 		if (dialog->data->sopts->opened) {
-			temp = g_strdup_printf ("%d",dialog->data->sopts->opened) ;
-			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp) ;
-			g_free (temp) ;
+			temp = g_strdup_printf ("%d",dialog->data->sopts->opened);
+			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp);
+			g_free (temp);
 		}
 		if (dialog->data->sopts->declined) {
-			temp = g_strdup_printf ("%d",dialog->data->sopts->declined) ;
-			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp) ;
-			g_free (temp) ;
+			temp = g_strdup_printf ("%d",dialog->data->sopts->declined);
+			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp);
+			g_free (temp);
 		}
 
 		if (dialog->data->gopts->priority) {
@@ -142,7 +142,7 @@ void
 org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 {
 
-	EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
+	EMsgComposer *comp = (struct _EMsgComposer *)t->composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 	gchar *temp = NULL;
@@ -152,17 +152,17 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 	if (!account)
 		return;
 
-	temp = strstr (account->transport->url, "groupwise") ;
+	temp = strstr (account->transport->url, "groupwise");
 	if (!temp) {
 		return;
 	}
 	e_msg_composer_set_send_options (comp, TRUE);
 	/* display the send options dialog */
 	if (!dialog) {
-		g_print ("New dialog\n\n") ;
-		dialog = e_sendoptions_dialog_new () ;
+		g_print ("New dialog\n\n");
+		dialog = e_sendoptions_dialog_new ();
 	}
-	e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ;
+	e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL);
 
 	g_signal_connect (dialog, "sod_response",
 				  G_CALLBACK (feed_input_data), comp);
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 57eba9392c..5a8a991288 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -85,7 +85,7 @@ org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target)
 		return;
 
 	if (! g_strrstr (uri, "groupwise://"))
-		return ;
+		return;
 
 	/* for translation*/
 	if (!first) {
@@ -347,7 +347,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 		return;
 
 	if (! g_strrstr (uri, "groupwise://"))
-		return ;
+		return;
 
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
@@ -451,7 +451,7 @@ retract_object (gpointer val)
 	}
 	g_free (rid);
 
-	free_thread_data (data)	;
+	free_thread_data (data);
 	return GINT_TO_POINTER (0);
 }
 
@@ -466,7 +466,7 @@ object_created_cb (CompEditor *ce, gpointer data)
 
 	response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL);
 	if (response == GTK_RESPONSE_NO) {
-		free_thread_data (data)	;
+		free_thread_data (data);
 		return;
 	}
 
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index ad15f051d0..20d477a345 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -175,7 +175,7 @@ proxy_login_new (void)
 	return prd;
 }
 
-static int
+static gint
 proxy_get_password (EAccount *account, gchar **user_name, gchar **password)
 {
 	const gchar *failed_auth;
@@ -309,9 +309,9 @@ proxy_soap_login (gchar *email)
 	EAccount *srcAccount;
 	EAccount *dstAccount;
 	EGwConnection *proxy_cnc, *cnc;
-	CamelURL *uri = NULL, *parent = NULL ;
+	CamelURL *uri = NULL, *parent = NULL;
 	gchar *password = NULL, *user_name = NULL;
-	gchar *proxy_source_url = NULL, *parent_source_url = NULL ;
+	gchar *proxy_source_url = NULL, *parent_source_url = NULL;
 	gchar *name;
 	gint i;
 	gint permissions = 0;
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 44c82610d6..7f526f8389 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -251,7 +251,7 @@ proxy_dialog_new (void)
 	return prd;
 }
 
-static int
+static gint
 proxy_get_permissions_from_dialog (EAccount *account)
 {
 	gint permissions;
@@ -301,7 +301,7 @@ proxy_get_permissions_from_dialog (EAccount *account)
 	return permissions;
 }
 
-static int
+static gint
 proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 {
 	GtkTreeIter iter;
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index c3036d1da3..b75d9abebb 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -328,7 +328,7 @@ static void
 send_options_copy_check_changed (EGwSendOptions *n_opts)
 {
 	EGwSendOptionsGeneral *ggopts, *o_gopts;
-	EGwSendOptionsStatusTracking *gmopts, *o_gmopts ;
+	EGwSendOptionsStatusTracking *gmopts, *o_gmopts;
 	EGwSendOptionsStatusTracking *gcopts, *o_gcopts;
 	EGwSendOptionsStatusTracking *gtopts, *o_gtopts;
 
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index c7c315c7f0..50bb6fccf3 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -159,7 +159,7 @@ static void
 create_folder_done (struct _EMCreateFolder *m)
 {
 	struct ShareInfo *ssi = (struct ShareInfo *) m->user_data;
-	CamelStore *store = CAMEL_STORE (m->store) ;
+	CamelStore *store = CAMEL_STORE (m->store);
 	EGwConnection *ccnc;
 
 	if (m->done) {
@@ -207,7 +207,7 @@ new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data)
 	g_object_unref (emfs);
 }
 
-static int
+static gint
 create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct _EMCreateFolder *m, gpointer user_data), gpointer user_data)
 {
 	gchar *name, *namebuf = NULL;
@@ -332,7 +332,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
 
 	camel_object_unref (store);
-	return ;
+	return;
 
 }
 
@@ -355,7 +355,7 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t)
 
 
 	if (! g_strrstr (t->uri, "groupwise://"))
-		return ;
+		return;
 
 	/* for translation*/
 	if (!first) {
@@ -378,7 +378,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data)
 
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
-	GtkWidget *dialog ;
+	GtkWidget *dialog;
 	gchar *uri;
 
 	model = mail_component_peek_tree_model (mail_component_peek ());
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 2b12d4be9b..87404db6bc 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -133,7 +133,7 @@ free_user_node(EShUsers *user)
 		g_free(user->email);
 		user->email = NULL;
 	}
-	return ;
+	return;
 }
 
 static void
@@ -144,7 +144,7 @@ free_node(SharedUser *usr)
 		g_free(user->email);
 		user->email = NULL;
 	}
-	return ;
+	return;
 }
 
 static SharedUser *
@@ -153,11 +153,11 @@ find_node(GList *list, gchar *email)
 	SharedUser *user = NULL;
 	EShUsers *usr = NULL;
 	GList *tmp;
-	gint i ;
+	gint i;
 
 	if(list){
 		tmp = g_list_first(list);
-		for(i=0; tmp  ; i++)
+		for(i=0; tmp; i++)
 		{
 			user = tmp->data;
 			usr = user->user_node;
@@ -346,7 +346,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			if (!g_ascii_strcasecmp (email, "" )) {
 				e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:no-user",NULL);
 
-				return ;
+				return;
 			}
 
 
@@ -354,7 +354,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			if (sf->users_list && email){
 				new_user = find_node (sf->users_list, (gchar *)email);
 				if (new_user)
-					return ;
+					return;
 
 			}
 			usr = g_new0 (EShUsers, 1);
@@ -586,7 +586,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 	path = gtk_tree_path_new_from_string (arg1);
 	if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)){
 		gtk_tree_path_free (path);
-		return ;
+		return;
 	}
 	gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 1, &right , -1);
 	usr = find_node(sf->users_list, email);
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 2569cbebd7..d9173e09e2 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -64,18 +64,18 @@ static void
 track_status (EPopup *ep, EPopupItem *item, gpointer data)
 {
 	EMPopupTargetSelect *t = (EMPopupTargetSelect *)data;
-	CamelMimeMessage *msg = NULL ;
-	const CamelInternetAddress *from ;
-	const gchar *namep, *addp ;
+	CamelMimeMessage *msg = NULL;
+	const CamelInternetAddress *from;
+	const gchar *namep, *addp;
 
-	GtkDialog *d ;
-	GtkTable *table ;
+	GtkDialog *d;
+	GtkTable *table;
 	GtkWidget *widget;
 	GtkScrolledWindow *win;
 	GtkVBox *vbox;
 
-	time_t time ;
-	gchar *time_str ;
+	time_t time;
+	gchar *time_str;
 
 	gchar *boldmsg;
 
@@ -87,8 +87,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data)
 	/*Get message*/
 	msg = camel_folder_get_message (t->folder, g_ptr_array_index (t->uids, 0), NULL);
 	if (!msg) {
-		g_print ("Error!! No message\n") ;
-		return ;
+		g_print ("Error!! No message\n");
+		return;
 	}
 
 	/*Create the dialog*/
@@ -120,8 +120,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data)
 	row++;
 
 	/*From*/
-	from = camel_mime_message_get_from (msg) ;
-	camel_internet_address_get (from, 0, &namep, &addp) ;
+	from = camel_mime_message_get_from (msg);
+	camel_internet_address_get (from, 0, &namep, &addp);
 	boldmsg = g_strdup_printf ("<b>%s</b>", _("From:"));
 	widget = gtk_label_new (boldmsg);
 	g_free (boldmsg);
@@ -134,8 +134,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data)
 	row++;
 
 	/*creation date*/
-	time = camel_mime_message_get_date (msg, NULL) ;
-	time_str = ctime (&time) ;
+	time = camel_mime_message_get_date (msg, NULL);
+	time_str = ctime (&time);
 	time_str[strlen(time_str)-1] = '\0' ;
 	boldmsg = g_strdup_printf ("<b>%s</b>", _("Creation date:"));
 	widget = gtk_label_new (boldmsg);
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index d5a17b7893..818c6a5e14 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -101,7 +101,7 @@ finalize (GObject *object)
 		g_free (config_listener->priv);
 	}
 
-	for ( list = g_list_first (hula_accounts); list ; list = g_list_next (list) ) {
+	for ( list = g_list_first (hula_accounts); list; list = g_list_next (list) ) {
 
 		info = (HulaAccountInfo *) (list->data);
 
@@ -147,7 +147,7 @@ static HulaAccountInfo*
 lookup_account_info (const gchar *key)
 {
 	GList *list;
-        HulaAccountInfo *info ;
+        HulaAccountInfo *info;
 	gint found = 0;
 
         if (!key)
@@ -176,7 +176,7 @@ add_esource (const gchar *conf_key, const gchar *group_name,  const gchar *sourc
 	ESourceGroup *group;
 	ESource *source;
         GConfClient *client;
-	GSList *ids, *temp ;
+	GSList *ids, *temp;
 	gboolean result;
 	gchar *source_selection_key;
 	gchar *relative_uri;
@@ -253,14 +253,14 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 
 	found_group = FALSE;
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), group_name) == 0 &&
 		   strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
 
@@ -325,7 +325,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const
 
 	found_group = FALSE;
 
-	for ( ; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
 
@@ -333,7 +333,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const
 		    strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for ( ; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
 
@@ -544,11 +544,11 @@ camel_hula_listener_construct (CamelHulaListener *config_listener)
 {
 	EIterator *iter;
 	EAccount *account;
-	HulaAccountInfo *info ;
+	HulaAccountInfo *info;
 
 	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
 
-	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
+	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) {
 
 		account = E_ACCOUNT (e_iterator_get (iter));
 
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index 5f518dece6..8c930eb82b 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -159,7 +159,7 @@ write_to_ipod (GString *str, gchar *path, gchar *filename)
 	guchar		*utf8;
 	gunichar2	*utf16;
 	guchar		bom[2] = {0xFF, 0xFE};
-	int			i, count;
+	gint			i, count;
 
 	output_path = g_build_path (G_DIR_SEPARATOR_S,
 										ipod_info.mount_point,
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index c2fe0e163a..5007bf6541 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -145,8 +145,8 @@ format_date_and_time_x		(struct tm	*date_tm,
 				 gboolean	 use_24_hour_format,
 				 gboolean	 show_midnight,
 				 gboolean	 show_zero_seconds,
-				 char		*buffer,
-				 int		 buffer_size)
+				 gchar		*buffer,
+				 gint		 buffer_size)
 {
 	gchar *format;
 	struct tm tomorrow_tm, week_tm;
diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index c7feb024b0..76b1e42da1 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-plugin.c
@@ -159,13 +159,13 @@ epm_invoke(EPlugin *ep, const gchar *name, gpointer data)
 
 	if (res) {
 		gpointer *p = mono_object_unbox(res);
-		d(printf("mono method returned '%p' %ld\n", *p, (long int)*p));
+		d(printf("mono method returned '%p' %ld\n", *p, (long gint)*p));
 		return *p;
 	} else
 		return NULL;
 }
 
-static int
+static gint
 epm_construct(EPlugin *ep, xmlNodePtr root)
 {
 	if (((EPluginClass *)epm_parent_class)->construct(ep, root) == -1)
diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c
index 94984a3560..49e1dffda4 100644
--- a/plugins/profiler/profiler.c
+++ b/plugins/profiler/profiler.c
@@ -40,7 +40,7 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t)
 	if (!fp) {
 		gchar *name;
 
-		name = g_strdup_printf("eprofile.%ld", (long int)getpid());
+		name = g_strdup_printf("eprofile.%ld", (long gint)getpid());
 		fp = fopen(name, "w");
 		if (fp)
 			fprintf(stderr, "Generating profiling data in `%s'\n", name);
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index ac3d8ea6f0..445b5f80bd 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -755,7 +755,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach)
 		camel_mime_part_set_content (part, attach->data, strlen (attach->data), mimetype);
 	} else {
 		gchar *buf = NULL;
-		size_t size;
+		gsize size;
 		size = pst_attach_to_mem (&m->pst, attach, &buf);
 
 		camel_mime_part_set_content (part, (gchar *) buf, size, mimetype);
@@ -1617,7 +1617,7 @@ pst_status (CamelOperation *op, const gchar *what, gint pc, gpointer data)
 	g_mutex_unlock (importer->status_lock);
 }
 
-static int
+static gint
 pst_import (EImport *ei, EImportTarget *target)
 {
 	PstImporter *m;
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 4650d97375..43e093eff2 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -394,7 +394,7 @@ update_timestamp (EPublishUri *uri)
 
 	if (uri->last_pub_time)
 		g_free (uri->last_pub_time);
-	uri->last_pub_time = g_strdup_printf ("%d", (int) time (NULL));
+	uri->last_pub_time = g_strdup_printf ("%d", (gint) time (NULL));
 
 	uris = g_slist_prepend (uris, e_publish_uri_to_xml (uri));
 
diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c
index aa273ae264..0a03809e97 100644
--- a/plugins/python/python-plugin-loader.c
+++ b/plugins/python/python-plugin-loader.c
@@ -69,7 +69,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data)
 	if (p->pModule == NULL) {
 		pModuleName = PyString_FromString(epp->module_name);
 
-		PyRun_SimpleString(g_strdup_printf ("import sys ; sys.path.insert(0, '%s')", epp->location));
+		PyRun_SimpleString(g_strdup_printf ("import sys; sys.path.insert(0, '%s')", epp->location));
 
 		p->pModule = PyImport_Import(pModuleName);
 
@@ -114,7 +114,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data)
 		return NULL;
 }
 
-static int
+static gint
 epp_construct(EPlugin *ep, xmlNodePtr root)
 {
 	if (((EPluginClass *)epp_parent_class)->construct(ep, root) == -1)
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index d7123dc4e7..5736786725 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -103,7 +103,7 @@ static gboolean em_junk_sa_allow_tell_tested = FALSE;
 gchar *em_junk_sa_spamc_gconf_binary = NULL;
 gchar *em_junk_sa_spamd_gconf_binary = NULL;
 
-static int
+static gint
 pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gint rv_err, gint wait_for_termination, GByteArray *output_buffer, GError **error)
 {
 	gint result, status, errnosav, fds[2], out_fds[2];
@@ -253,7 +253,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin
 		return 0;
 }
 
-static int
+static gint
 pipe_to_sa (CamelMimeMessage *msg, const gchar *in, const gchar **argv, GError **error)
 {
 	return pipe_to_sa_full (msg, in, argv, -1, 1, NULL, error);
@@ -513,7 +513,7 @@ em_junk_sa_is_available (GError **error)
 
 	/* While we're at it, see if spamd is running with --allow-tell */
 	if (!em_junk_sa_allow_tell_tested)
-		em_junk_sa_test_allow_tell () ;
+		em_junk_sa_test_allow_tell ();
 
 	pthread_mutex_unlock (&em_junk_sa_init_lock);
 
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 95a3c1e361..53669ba347 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -550,7 +550,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, gpointer data)
 			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC));
 
 	camel_mime_part_set_content((CamelMimePart *)new,
-			cont, (int) g_utf8_strlen(cont, -1), "text");
+			cont, (gint) g_utf8_strlen(cont, -1), "text");
 
 	/* Create the composer */
 	em_utils_edit_message (new, templates_folder);
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index cd706e694e..3ad583c2a7 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -223,7 +223,7 @@ void processTnef(TNEFStruct *tnef) {
     gint foundCal=0;
 
     FILE *fptr;
-    ifilename = (gchar *) g_malloc(sizeof(char) * 256);
+    ifilename = (gchar *) g_malloc(sizeof(gchar) * 256);
 
     /* First see if this requires special processing. */
     /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */
@@ -940,7 +940,7 @@ void saveVCalendar(TNEFStruct *tnef) {
         if (filename!=NULL) {
             fprintf(fptr, "UID:");
             for(index=0;index<filename->size;index++) {
-                fprintf(fptr,"%02X", (unsigned char)filename->data[index]);
+                fprintf(fptr,"%02X", (guchar)filename->data[index]);
             }
             fprintf(fptr,"\n");
         }
@@ -950,7 +950,7 @@ void saveVCalendar(TNEFStruct *tnef) {
         if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_LONG, 0x8201))) != MAPI_UNDEFINED) {
             ddword_ptr = (DDWORD*)filename->data;
-            fprintf(fptr, "SEQUENCE:%i\n", (int) *ddword_ptr);
+            fprintf(fptr, "SEQUENCE:%i\n", (gint) *ddword_ptr);
         }
         if ((filename=MAPIFindProperty(&(tnef->MapiProperties),
                         PROP_TAG(PT_BINARY, PR_SENDER_SEARCH_KEY)))
diff --git a/shell/main.c b/shell/main.c
index 6cb7d7c255..438f09d7a9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -342,7 +342,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;
 
diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c
index 6e490f6123..e0d644344b 100644
--- a/smime/lib/e-asn1-object.c
+++ b/smime/lib/e-asn1-object.c
@@ -136,7 +136,7 @@ e_asn1_object_get_type (void)
    as defined by the DER (Distinguised Encoding Rules) of
    ASN1.
 */
-static int
+static gint
 get_integer_256 (guchar *data, guint nb)
 {
 	gint val;
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 5caa13e4f4..52fa966f76 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -207,7 +207,7 @@ prompt_for_password (gchar *title, gchar *prompt, SECItem *pwd)
 					   NULL);
 
 	if (passwd) {
-		size_t len = strlen (passwd);
+		gsize len = strlen (passwd);
 		const gchar *inptr = passwd;
 		guchar *outptr;
 		gunichar2 c;
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index e55938978c..ea30c1701e 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -323,7 +323,7 @@ e_timezone_dialog_construct (ETimezoneDialog *etd)
 }
 
 #if 0
-static int
+static gint
 get_local_offset (void)
 {
 	time_t now = time(NULL), t_gmt, t_local;
@@ -396,8 +396,8 @@ e_timezone_dialog_new (void)
 }
 
 static void
-format_utc_offset			(int		 utc_offset,
-					 char		*buffer)
+format_utc_offset			(gint		 utc_offset,
+					 gchar		*buffer)
 {
   const gchar *sign = "+";
   gint hours, minutes, seconds;
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index 82ab22eedc..a977e0a787 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -60,14 +60,14 @@ gdvm_dispose(GObject *object)
 }
 
 /* This function returns the number of columns in our ETableModel. */
-static int
+static gint
 gdvm_col_count (ETableModel *etc)
 {
 	return 1;
 }
 
 /* This function returns the number of rows in our ETableModel. */
-static int
+static gint
 gdvm_row_count (ETableModel *etc)
 {
 	GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc);
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
index 688e833aeb..d12f4ae792 100644
--- a/widgets/menus/gal-view-etable.c
+++ b/widgets/menus/gal-view-etable.c
@@ -165,15 +165,15 @@ gal_view_etable_class_init      (GalViewEtableClass *klass)
 	GalViewClass *gal_view_class  = GAL_VIEW_CLASS (klass);
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	gal_view_class->edit          = gal_view_etable_edit         ;
-	gal_view_class->load          = gal_view_etable_load         ;
-	gal_view_class->save          = gal_view_etable_save         ;
-	gal_view_class->get_title     = gal_view_etable_get_title    ;
-	gal_view_class->set_title     = gal_view_etable_set_title    ;
+	gal_view_class->edit          = gal_view_etable_edit;
+	gal_view_class->load          = gal_view_etable_load;
+	gal_view_class->save          = gal_view_etable_save;
+	gal_view_class->get_title     = gal_view_etable_get_title;
+	gal_view_class->set_title     = gal_view_etable_set_title;
 	gal_view_class->get_type_code = gal_view_etable_get_type_code;
-	gal_view_class->clone         = gal_view_etable_clone        ;
+	gal_view_class->clone         = gal_view_etable_clone;
 
-	object_class->dispose         = gal_view_etable_dispose      ;
+	object_class->dispose         = gal_view_etable_dispose;
 }
 
 static void
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index b61f1ac155..e3a24726c5 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -206,7 +206,7 @@ gal_view_new_dialog_construct (GalViewNewDialog  *dialog,
 	gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->list), column);
 
 	iterator = dialog->collection->factory_list;
-	for ( ; iterator; iterator = g_list_next(iterator) ) {
+	for (; iterator; iterator = g_list_next(iterator) ) {
 		GalViewFactory *factory = iterator->data;
 		GtkTreeIter iter;
 
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index c1d599e879..9c9bd94b15 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -60,37 +60,37 @@ static void e_calendar_item_unmap	(GnomeCanvasItem *item);
 static void e_calendar_item_update	(GnomeCanvasItem *item,
 					 double		 *affine,
 					 ArtSVP		 *clip_path,
-					 int		  flags);
+					 gint		  flags);
 static void e_calendar_item_draw	(GnomeCanvasItem *item,
 					 GdkDrawable	 *drawable,
-					 int		  x,
-					 int		  y,
-					 int		  width,
-					 int		  height);
+					 gint		  x,
+					 gint		  y,
+					 gint		  width,
+					 gint		  height);
 static void e_calendar_item_draw_month	(ECalendarItem   *calitem,
 					 GdkDrawable	 *drawable,
-					 int		  x,
-					 int		  y,
-					 int		  width,
-					 int		  height,
-					 int		  row,
-					 int		  col);
+					 gint		  x,
+					 gint		  y,
+					 gint		  width,
+					 gint		  height,
+					 gint		  row,
+					 gint		  col);
 static void e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 					      GdkDrawable	*drawable,
-					      int		 width,
-					      int		 height,
-					      int		 row,
-					      int		 col,
-					      int		 year,
-					      int		 month,
-					      int		 start_weekday,
+					      gint		 width,
+					      gint		 height,
+					      gint		 row,
+					      gint		 col,
+					      gint		 year,
+					      gint		 month,
+					      gint		 start_weekday,
 					      gint		 cells_x,
 					      gint		 cells_y);
 static double e_calendar_item_point	(GnomeCanvasItem *item,
 					 double		  x,
 					 double		  y,
-					 int		  cx,
-					 int		  cy,
+					 gint		  cx,
+					 gint		  cy,
 					 GnomeCanvasItem **actual_item);
 static void e_calendar_item_stop_selecting (ECalendarItem *calitem,
 					    guint32 time);
@@ -891,7 +891,7 @@ static void
 e_calendar_item_update		(GnomeCanvasItem *item,
 				 double		 *affine,
 				 ArtSVP		 *clip_path,
-				 int		  flags)
+				 gint		  flags)
 {
 	ECalendarItem *calitem;
 	GtkStyle *style;
@@ -1024,10 +1024,10 @@ e_calendar_item_update		(GnomeCanvasItem *item,
 static void
 e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
 				 GdkDrawable	 *drawable,
-				 int		  x,
-				 int		  y,
-				 int		  width,
-				 int		  height)
+				 gint		  x,
+				 gint		  y,
+				 gint		  width,
+				 gint		  height)
 {
 	ECalendarItem *calitem;
 	GtkStyle *style;
@@ -1151,12 +1151,12 @@ layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, gint day_index
 static void
 e_calendar_item_draw_month	(ECalendarItem   *calitem,
 				 GdkDrawable	 *drawable,
-				 int		  x,
-				 int		  y,
-				 int		  width,
-				 int		  height,
-				 int		  row,
-				 int		  col)
+				 gint		  x,
+				 gint		  y,
+				 gint		  width,
+				 gint		  height,
+				 gint		  row,
+				 gint		  col)
 {
 	GnomeCanvasItem *item;
 	GtkWidget *widget;
@@ -1395,13 +1395,13 @@ get_digit_fomat ()
 static void
 e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 				  GdkDrawable	*drawable,
-				  int		 width,
-				  int		 height,
-				  int		 row,
-				  int		 col,
-				  int		 year,
-				  int		 month,
-				  int		 start_weekday,
+				  gint		 width,
+				  gint		 height,
+				  gint		 row,
+				  gint		 col,
+				  gint		 year,
+				  gint		 month,
+				  gint		 start_weekday,
 				  gint		 cells_x,
 				  gint		 cells_y)
 {
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 1eb0ddec12..bb0bd775e9 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -330,7 +330,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags )
 				max_width = item_width;
 			list = g_list_next(list);
 
-			for( ; list; list = g_list_next(list)) {
+			for(; list; list = g_list_next(list)) {
 				running_height += e_canvas_vbox->spacing;
 
 				g_object_get (list->data,
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 39b89d2675..53e3eafeec 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -147,7 +147,7 @@ e_canvas_new (void)
 /* Emits an event for an item in the canvas, be it the current item, grabbed
  * item, or focused item, as appropriate.
  */
-static int
+static gint
 emit_event (GnomeCanvas *canvas, GdkEvent *event)
 {
 	GdkEvent *ev;
@@ -316,7 +316,7 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item, double x, double y, gint
  */
 #define DISPLAY_X1(canvas) (GNOME_CANVAS (canvas)->layout.xoffset)
 #define DISPLAY_Y1(canvas) (GNOME_CANVAS (canvas)->layout.yoffset)
-static int
+static gint
 pick_current_item (GnomeCanvas *canvas, GdkEvent *event)
 {
 	gint button_down;
@@ -392,8 +392,8 @@ pick_current_item (GnomeCanvas *canvas, GdkEvent *event)
 
 		/* canvas pixel coords */
 
-		cx = (int) (x + 0.5);
-		cy = (int) (y + 0.5);
+		cx = (gint) (x + 0.5);
+		cy = (gint) (y + 0.5);
 
 		/* world coords */
 
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index b9ae1ad901..84b016934e 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -153,9 +153,9 @@ static void on_date_popup_date_selected		(ECalendarItem	*calitem,
 						 EDateEdit	*dedit);
 static void hide_date_popup			(EDateEdit	*dedit);
 static void rebuild_time_popup			(EDateEdit	*dedit);
-static gboolean field_set_to_none		(const char	*text);
+static gboolean field_set_to_none		(const gchar	*text);
 static gboolean e_date_edit_parse_date		(EDateEdit	*dedit,
-						 const char	*date_text,
+						 const gchar	*date_text,
 						 struct tm	*date_tm);
 static gboolean e_date_edit_parse_time		(EDateEdit	*dedit,
 						 const gchar	*time_text,
@@ -1504,7 +1504,7 @@ field_set_to_none (const gchar *text)
 	gint n;
 
 	pos = text;
-	while (n = (int)((unsigned char)*pos), isspace (n))
+	while (n = (gint)((guchar)*pos), isspace (n))
 		pos++;
 
 	none_string = _("None");
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 1bc183dbe5..4463fd12d8 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -551,7 +551,7 @@ filter_bar_get_property (GObject *object,
 	}
 }
 
-static int
+static gint
 xml_get_prop_int (xmlNodePtr node, const gchar *prop)
 {
 	gchar *buf;
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index e11439eb26..3c83cb1048 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -241,7 +241,7 @@ set_image_from_data (EImageChooser *chooser,
 		GdkPixbuf *scaled;
 		GdkPixbuf *composite;
 
-		float scale;
+		gfloat scale;
 		gint new_height, new_width;
 
 		new_height = gdk_pixbuf_get_height (pixbuf);
@@ -259,17 +259,17 @@ set_image_from_data (EImageChooser *chooser,
 			/* we need to scale down */
 			printf ("we need to scale down\n");
 			if (new_height > new_width)
-				scale = (float)chooser->priv->image_height / new_height;
+				scale = (gfloat)chooser->priv->image_height / new_height;
 			else
-				scale = (float)chooser->priv->image_width / new_width;
+				scale = (gfloat)chooser->priv->image_width / new_width;
 		}
 		else {
 			/* we need to scale up */
 			printf ("we need to scale up\n");
 			if (new_height > new_width)
-				scale = (float)new_height / chooser->priv->image_height;
+				scale = (gfloat)new_height / chooser->priv->image_height;
 			else
-				scale = (float)new_width / chooser->priv->image_width;
+				scale = (gfloat)new_width / chooser->priv->image_width;
 		}
 
 		printf ("scale = %g\n", scale);
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index f35335f37d..82ce1c17aa 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -689,7 +689,7 @@ e_map_world_to_window (EMap *map, double world_longitude, double world_latitude,
 /* --- Zoom --- */
 
 
-double
+gdouble
 e_map_get_magnification (EMap *map)
 {
 	EMapPrivate *priv;
@@ -1153,8 +1153,8 @@ repaint_point (EMap *map, EMapPoint *point)
 
 	e_map_world_to_window (map, point->longitude, point->latitude, &px, &py);
 
-	area.x = (int) px - 2;
-	area.y = (int) py - 2;
+	area.x = (gint) px - 2;
+	area.y = (gint) py - 2;
 	area.width = 5;
 	area.height = 5;
 	request_paint_area (map, &area);
diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h
index 0c915fb5fa..df3f70a343 100644
--- a/widgets/misc/e-map.h
+++ b/widgets/misc/e-map.h
@@ -96,7 +96,7 @@ void e_map_world_to_window (EMap *map,
 
 /* --- Zoom --- */
 
-double e_map_get_magnification (EMap *map);
+gdouble e_map_get_magnification (EMap *map);
 
 /* Pass TRUE if we want the smooth zoom hack */
 void e_map_set_smooth_zoom (EMap *map, gboolean state);
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index dde69a7e06..90922b5560 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -357,7 +357,7 @@ esma_invert_selection (ESelectionModel *selection)
 	e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), -1, -1);
 }
 
-static int
+static gint
 esma_row_count (ESelectionModel *selection)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
@@ -405,14 +405,14 @@ esma_change_range(ESelectionModel *selection, gint start, gint end, gboolean gro
 	}
 }
 
-static int
+static gint
 esma_cursor_row (ESelectionModel *selection)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
 	return esma->cursor_row;
 }
 
-static int
+static gint
 esma_cursor_col (ESelectionModel *selection)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
@@ -569,25 +569,25 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *klass)
 	object_class->get_property = esma_get_property;
 	object_class->set_property = esma_set_property;
 
-	esm_class->is_row_selected    = esma_is_row_selected    ;
-	esm_class->foreach            = esma_foreach            ;
-	esm_class->clear              = esma_clear              ;
-	esm_class->selected_count     = esma_selected_count     ;
-	esm_class->select_all         = esma_select_all         ;
-	esm_class->invert_selection   = esma_invert_selection   ;
-	esm_class->row_count          = esma_row_count          ;
-
-	esm_class->change_one_row     = esma_change_one_row     ;
-	esm_class->change_cursor      = esma_change_cursor      ;
-	esm_class->cursor_row         = esma_cursor_row         ;
-	esm_class->cursor_col         = esma_cursor_col         ;
-
-	esm_class->select_single_row  = esma_select_single_row  ;
-	esm_class->toggle_single_row  = esma_toggle_single_row  ;
-	esm_class->move_selection_end = esma_move_selection_end ;
-	esm_class->set_selection_end  = esma_set_selection_end  ;
-
-	klass->get_row_count          = NULL                    ;
+	esm_class->is_row_selected    = esma_is_row_selected;
+	esm_class->foreach            = esma_foreach;
+	esm_class->clear              = esma_clear;
+	esm_class->selected_count     = esma_selected_count;
+	esm_class->select_all         = esma_select_all;
+	esm_class->invert_selection   = esma_invert_selection;
+	esm_class->row_count          = esma_row_count;
+
+	esm_class->change_one_row     = esma_change_one_row;
+	esm_class->change_cursor      = esma_change_cursor;
+	esm_class->cursor_row         = esma_cursor_row;
+	esm_class->cursor_col         = esma_cursor_col;
+
+	esm_class->select_single_row  = esma_select_single_row;
+	esm_class->toggle_single_row  = esma_toggle_single_row;
+	esm_class->move_selection_end = esma_move_selection_end;
+	esm_class->set_selection_end  = esma_set_selection_end;
+
+	klass->get_row_count          = NULL;
 
 	g_object_class_install_property (object_class, PROP_CURSOR_ROW,
 					 g_param_spec_int ("cursor_row",
diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
index 78303cc9ec..bf71e4e50c 100644
--- a/widgets/misc/e-spinner.c
+++ b/widgets/misc/e-spinner.c
@@ -315,7 +315,7 @@ e_spinner_images_load (GdkScreen *screen,
 	n = 0;
 	for (y = 0; y < grid_height; y += size)
 	{
-		for (x = 0; x < grid_width ; x += size)
+		for (x = 0; x < grid_width; x += size)
 		{
 			pixbuf = extract_frame (icon_pixbuf, x, y, size);
 
@@ -633,7 +633,7 @@ e_spinner_init (ESpinner *spinner)
 	details->need_load = TRUE;
 }
 
-static int
+static gint
 e_spinner_expose (GtkWidget *widget,
 		     GdkEventExpose *event)
 {
diff --git a/widgets/misc/test-preferences-window.c b/widgets/misc/test-preferences-window.c
index 4e4d9894fa..c5291cf755 100644
--- a/widgets/misc/test-preferences-window.c
+++ b/widgets/misc/test-preferences-window.c
@@ -50,7 +50,7 @@ add_pages (EPreferencesWindow *preferences_window)
 	}
 }
 
-static int
+static gint
 delete_event_callback (GtkWidget *widget,
 		       GdkEventAny *event,
 		       gpointer data)
diff --git a/widgets/table/a11y/gal-a11y-e-cell-toggle.c b/widgets/table/a11y/gal-a11y-e-cell-toggle.c
index 4fec22577b..df687f4005 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/a11y/gal-a11y-e-cell-toggle.c
@@ -102,8 +102,8 @@ toggle_cell_action (GalA11yECell *cell)
 	e_table_item_get_cell_geometry (cell->item, &row, &col,
 					&x, &y, &width, &height);
 
-	event.x = x + width / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->x1);
-	event.y = y + height / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->y1);
+	event.x = x + width / 2 + (gint)(GNOME_CANVAS_ITEM (cell->item)->x1);
+	event.y = y + height / 2 + (gint)(GNOME_CANVAS_ITEM (cell->item)->y1);
 
 	event.type = GDK_BUTTON_PRESS;
 	event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;
diff --git a/widgets/table/a11y/gal-a11y-e-table-item.c b/widgets/table/a11y/gal-a11y-e-table-item.c
index a3044a702b..561b9a84d6 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item.c
+++ b/widgets/table/a11y/gal-a11y-e-table-item.c
@@ -799,8 +799,8 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
         reorder = g_malloc0 (sizeof (gint) * n_cols);
 
         /* Compare with previously saved column headers. */
-        for ( i = 0 ; i < n_cols && cols[i]; i ++ ) {
-                for ( j = 0 ; j < prev_n_cols && prev_cols[j]; j ++ ) {
+        for ( i = 0; i < n_cols && cols[i]; i ++ ) {
+                for ( j = 0; j < prev_n_cols && prev_cols[j]; j ++ ) {
                         if ( prev_cols [j] == cols[i] && i != j ) {
 
                                 reorder_found = TRUE;
@@ -822,8 +822,8 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
         }
 
         /* Now try to find if there are removed columns. */
-        for (i = 0 ; i < prev_n_cols && prev_cols[i]; i ++) {
-                for (j = 0 ; j < n_cols && cols[j]; j ++)
+        for (i = 0; i < prev_n_cols && prev_cols[i]; i ++) {
+                for (j = 0; j < n_cols && cols[j]; j ++)
                         if ( prev_cols [j] == cols[i] )
 				break;
 
@@ -847,7 +847,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 		for (i = 0; i < prev_n_cols; i ++ ) {
 			if (prev_state[i] == ETI_HEADER_REMOVED) {
 				g_signal_emit_by_name (G_OBJECT(a11y_item), "column-deleted", i, 1);
-				for (j = 0 ; j < n_rows; j ++)
+				for (j = 0; j < n_rows; j ++)
 					g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::remove", ((j+1)*prev_n_cols+i), NULL, NULL);
 			}
 		}
@@ -857,7 +857,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 		for ( i = 0; i < n_cols; i ++ ) {
 			if (state[i] == ETI_HEADER_NEW_ADDED) {
 				g_signal_emit_by_name (G_OBJECT(a11y_item), "column-inserted", i, 1);
-				for (j = 0 ; j < n_rows; j ++)
+				for (j = 0; j < n_rows; j ++)
 					g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::add", ((j+1)*n_cols+i), NULL, NULL);
 			}
 		}
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index e171080610..9fd01f9874 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -411,7 +411,7 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	*x += x1;
 	/* The ETable positions don't include the grid lines, I think, so we add 1. */
 	*y += y1 + 1
-		- (int)((GnomeCanvas *)canvas)->layout.vadjustment->value
+		- (gint)((GnomeCanvas *)canvas)->layout.vadjustment->value
 		+ ((GnomeCanvas *)canvas)->zoom_yofs;
 
 	scrollbar_width = popup->vscrollbar->requisition.width
@@ -595,7 +595,7 @@ e_cell_combo_button_release		(GtkWidget	*popup_window,
 
 /* This handles key press events in the popup window. If the Escape key is
    pressed we hide the popup, and do not change the cell contents. */
-static int
+static gint
 e_cell_combo_key_press			(GtkWidget	*popup_window,
 					 GdkEventKey	*event,
 					 ECellCombo	*ecc)
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index b2b921c5f5..9207437cb3 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -65,7 +65,7 @@ static gint e_cell_date_edit_do_popup		(ECellPopup	*ecp,
 						 gint             view_col);
 static void e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde);
 static void e_cell_date_edit_select_matching_time(ECellDateEdit	*ecde,
-						  char		*time);
+						  gchar		*time);
 static void e_cell_date_edit_show_popup		(ECellDateEdit	*ecde,
 						 gint             row,
 						 gint             view_col);
@@ -565,7 +565,7 @@ e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
 
 static void
 e_cell_date_edit_select_matching_time	(ECellDateEdit	*ecde,
-					 char		*time)
+					 gchar		*time)
 {
 	gboolean found = FALSE;
 	gboolean valid;
@@ -667,7 +667,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	/* The ETable positions don't include the grid lines, I think, so we
 	   add 1. */
 	*y += y1 + 1
-		- (int)((GnomeCanvas *)canvas)->layout.vadjustment->value
+		- (gint)((GnomeCanvas *)canvas)->layout.vadjustment->value
 		+ ((GnomeCanvas *)canvas)->zoom_yofs;
 
 	avail_height = gdk_screen_height () - *y;
@@ -713,7 +713,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 
 /* This handles key press events in the popup window. If the Escape key is
    pressed we hide the popup, and do not change the cell contents. */
-static int
+static gint
 e_cell_date_edit_key_press		(GtkWidget	*popup_window,
 					 GdkEventKey	*event,
 					 ECellDateEdit	*ecde)
@@ -731,7 +731,7 @@ e_cell_date_edit_key_press		(GtkWidget	*popup_window,
 /* This handles button press events in the popup window. If the button is
    pressed outside the popup, we hide it and do not change the cell contents.
 */
-static int
+static gint
 e_cell_date_edit_button_press		(GtkWidget	*popup_window,
 					 GdkEventButton	*event,
 					 ECellDateEdit	*ecde)
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 1673fd5435..53d1b79934 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -204,7 +204,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 /*
  * ECell::height method
  */
-static int
+static gint
 ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 {
 	ECellHboxView *hbox_view = (ECellHboxView *)ecell_view;
@@ -221,7 +221,7 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 /*
  * ECell::max_width method
  */
-static int
+static gint
 ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 {
 	ECellHboxView *hbox_view = (ECellHboxView *)ecell_view;
diff --git a/widgets/table/e-cell-percent.c b/widgets/table/e-cell-percent.c
index 378bb8ab55..35dbb611ed 100644
--- a/widgets/table/e-cell-percent.c
+++ b/widgets/table/e-cell-percent.c
@@ -90,7 +90,7 @@ ecp_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
 	if (text) {
 		p = text;
 		while (*p) {
-			if (!isspace ((unsigned char) *p)) {
+			if (!isspace ((guchar) *p)) {
 				empty = FALSE;
 				break;
 			}
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 9480ec5b8c..26897709c2 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -57,55 +57,55 @@ static void	ecp_realize		(ECellView	*ecv);
 static void	ecp_unrealize		(ECellView	*ecv);
 static void	ecp_draw		(ECellView	*ecv,
 					 GdkDrawable	*drawable,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row,
 					 ECellFlags	 flags,
-					 int		 x1,
-					 int		 y1,
-					 int		 x2,
-					 int		 y2);
+					 gint		 x1,
+					 gint		 y1,
+					 gint		 x2,
+					 gint		 y2);
 static gint	ecp_event		(ECellView	*ecv,
 					 GdkEvent	*event,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row,
 					 ECellFlags	 flags,
 					 ECellActions	*actions);
-static int	ecp_height		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row);
+static gint	ecp_height		(ECellView	*ecv,
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row);
 static gpointer	ecp_enter_edit		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row);
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row);
 static void	ecp_leave_edit		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row,
 					 void		*edit_context);
 static void	ecp_print		(ECellView	*ecv,
 					 GtkPrintContext *context,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row,
 					 double		 width,
 					 double		 height);
 static gdouble	ecp_print_height	(ECellView	*ecv,
 					 GtkPrintContext *context,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row,
 					 double		 width);
-static int	ecp_max_width		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col);
+static gint	ecp_max_width		(ECellView	*ecv,
+					 gint		 model_col,
+					 gint		 view_col);
 static void	ecp_show_tooltip	(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 int		 col_width,
+					 gint		 model_col,
+					 gint		 view_col,
+					 gint		 row,
+					 gint		 col_width,
 					 ETableTooltip	*tooltip);
 static gchar *ecp_get_bg_color (ECellView *ecell_view, gint row);
 
@@ -368,7 +368,7 @@ ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col,
 /*
  * ECell::height method
  */
-static int
+static gint
 ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
@@ -426,7 +426,7 @@ ecp_print_height (ECellView *ecv, GtkPrintContext *context,
 }
 
 
-static int
+static gint
 ecp_max_width (ECellView *ecv,
 	       gint model_col,
 	       gint view_col)
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index 1fa949ec6a..e2b379f2f9 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -42,7 +42,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, gint col, gint row)
 	} else {
 		fsize = ((gfloat) size) / 1024.0;
 		if (fsize < 1024.0) {
-			return g_strdup_printf ("%d K", (int)fsize);
+			return g_strdup_printf ("%d K", (gint)fsize);
 		} else {
 			fsize /= 1024.0;
 			return g_strdup_printf ("%.1f MB", fsize);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index d5eafb801b..c1d5dc88bb 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -504,7 +504,7 @@ static PangoLayout *
 layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint width)
 {
 	CellEdit *edit = text_view->edit;
-	PangoAttrList *attrs ;
+	PangoAttrList *attrs;
 	PangoLayout *layout;
 	GString *tmp_string = g_string_new (NULL);
 	PangoAttrList *preedit_attrs = NULL;
@@ -567,7 +567,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 {
 	ECellView *ecell_view = (ECellView *) text_view;
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-	PangoAttrList *attrs ;
+	PangoAttrList *attrs;
 	PangoLayout *layout;
 	PangoContext *context;
 	cairo_font_options_t *font_options;
@@ -1145,7 +1145,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 /*
  * ECell::height method
  */
-static int
+static gint
 ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
@@ -1430,7 +1430,7 @@ ect_print_height (ECellView *ecell_view, GtkPrintContext *context,
 	return 16 + 8;
 }
 
-static int
+static gint
 ect_max_width (ECellView *ecell_view,
 	       gint model_col,
 	       gint view_col)
@@ -1456,7 +1456,7 @@ ect_max_width (ECellView *ecell_view,
 	return max_width + 8;
 }
 
-static int
+static gint
 ect_max_width_by_row (ECellView *ecell_view,
 		      gint model_col,
 		      gint view_col,
@@ -1558,8 +1558,8 @@ ect_show_tooltip (ECellView *ecell_view,
 			       &canvas_x, &canvas_y);
 	pixel_origin.x += canvas_x;
 	pixel_origin.y += canvas_y;
-	pixel_origin.x -= (int) gtk_layout_get_hadjustment (GTK_LAYOUT (text_view->canvas))->value;
-	pixel_origin.y -= (int) gtk_layout_get_vadjustment (GTK_LAYOUT (text_view->canvas))->value;
+	pixel_origin.x -= (gint) gtk_layout_get_hadjustment (GTK_LAYOUT (text_view->canvas))->value;
+	pixel_origin.y -= (gint) gtk_layout_get_vadjustment (GTK_LAYOUT (text_view->canvas))->value;
 
 	window = gtk_window_new (GTK_WINDOW_POPUP);
 	gtk_container_set_border_width (GTK_CONTAINER (window), 1);
@@ -2163,7 +2163,7 @@ _blink_scroll_timeout (gpointer data)
 	return TRUE;
 }
 
-static int
+static gint
 next_word (CellEdit *edit, gint start)
 {
 	gchar *p;
@@ -2185,7 +2185,7 @@ next_word (CellEdit *edit, gint start)
 	return p - edit->text;
 }
 
-static int
+static gint
 _get_position (ECellTextView *text_view, ETextEventProcessorCommand *command)
 {
 	gint length;
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index df4a6f827c..f3ecc415b4 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -98,7 +98,7 @@ ECell     *e_cell_text_construct(ECellText *cell, const gchar *fontname, GtkJust
 /* Gets the value from the model and converts it into a string. In ECellText
    itself, the value is assumed to be a gchar * and so needs no conversion.
    In subclasses the ETableModel value may be a more complicated datatype. */
-char	  *e_cell_text_get_text (ECellText *cell, ETableModel *model, gint col, gint row);
+gchar	  *e_cell_text_get_text (ECellText *cell, ETableModel *model, gint col, gint row);
 
 /* Frees the value returned by e_cell_text_get_text(). */
 void	   e_cell_text_free_text (ECellText *cell, gchar *text);
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 5754b73338..baad2027d5 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -215,7 +215,7 @@ etog_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_co
 /*
  * ECell::height method
  */
-static int
+static gint
 etog_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 {
 	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
@@ -275,7 +275,7 @@ etog_print_height (ECellView *ecell_view, GtkPrintContext *context,
 /*
  * ECell::max_width method
  */
-static int
+static gint
 etog_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 {
 	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 759fd6f70b..c3ecca939b 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -93,7 +93,7 @@ e_cell_tree_get_tree_table_adapter (ETableModel *table_model, gint row)
 	return e_table_model_value_at (table_model, -3, row);
 }
 
-static int
+static gint
 visible_depth_of_node (ETableModel *model, gint row)
 {
 	ETreeModel *tree_model = e_cell_tree_get_tree_model(model, row);
@@ -427,7 +427,7 @@ event_in_expander (GdkEvent *event, gint offset, gint height)
 /*
  * ECell::height method
  */
-static int
+static gint
 ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
@@ -567,7 +567,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 /*
  * ECell::max_width method
  */
-static int
+static gint
 ect_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 65c2723adc..30bb9027a9 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -191,7 +191,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 /*
  * ECell::height method
  */
-static int
+static gint
 ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 {
 	ECellVboxView *vbox_view = (ECellVboxView *)ecell_view;
@@ -207,7 +207,7 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 /*
  * ECell::max_width method
  */
-static int
+static gint
 ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 {
 	ECellVboxView *vbox_view = (ECellVboxView *)ecell_view;
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 6c192eb6b4..99a290dea2 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -313,7 +313,7 @@ etcta_unrealize (GnomeCanvasItem *item)
 
 static void finish_editing (ETableClickToAdd *etcta);
 
-static int
+static gint
 item_key_press (ETableItem *item, gint row, gint col, GdkEvent *event, ETableClickToAdd *etcta)
 {
 	switch (event->key.keyval) {
@@ -374,7 +374,7 @@ finish_editing (ETableClickToAdd *etcta)
 /*
  * Handles the events on the ETableClickToAdd, particularly it creates the ETableItem and passes in some events.
  */
-static int
+static gint
 etcta_event (GnomeCanvasItem *item, GdkEvent *e)
 {
 	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
index 0fd82bf0ed..00b0ab2fd9 100644
--- a/widgets/table/e-table-config-field.c
+++ b/widgets/table/e-table-config-field.c
@@ -81,7 +81,7 @@ e_table_config_field_new       (ETableSpecification *spec,
 	return (ETableConfigField *) etcf;
 }
 
-inline static int
+inline static gint
 etcf_get_count (ETableConfigField *etcf)
 {
 	if (etcf->grouping)
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 1fba29f580..cc61d1eb46 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -249,7 +249,7 @@ find_column_in_spec (ETableSpecification *spec, gint model_col)
 	return NULL;
 }
 
-static int
+static gint
 find_model_column_by_name (ETableSpecification *spec, const gchar *s)
 {
 	ETableColumnSpecification **column;
@@ -1047,7 +1047,7 @@ config_button_remove (GtkWidget *widget, ETableConfig *config)
 	for (column = columns; column; column = column->next) {
 		gint row = GPOINTER_TO_INT (column->data);
 
-		memmove (config->temp_state->columns + row, config->temp_state->columns + row + 1, sizeof (int) * (config->temp_state->col_count - row - 1));
+		memmove (config->temp_state->columns + row, config->temp_state->columns + row + 1, sizeof (gint) * (config->temp_state->col_count - row - 1));
 		memmove (config->temp_state->expansions + row, config->temp_state->expansions + row + 1, sizeof (double) * (config->temp_state->col_count - row - 1));
 		config->temp_state->col_count --;
 	}
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index 295820da23..391873b043 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -133,13 +133,13 @@ gboolean importance_data[ROWS];
 static GdkColor *color1;
 static GdkColor *color2;
 
-static int
+static gint
 my_col_count (ETableModel *etc, gpointer data)
 {
 	return VIRTUAL_COLS;
 }
 
-static int
+static gint
 my_row_count (ETableModel *etc, gpointer data)
 {
 	return ROWS;
@@ -232,9 +232,9 @@ static gchar *
 my_value_to_string (ETableModel *etc, gint col, gconstpointer value, gpointer data)
 {
 	if (col == COLOR_COLUMN){
-		return g_strdup_printf("%d", (int) value);
+		return g_strdup_printf("%d", (gint) value);
 	} else if (col == IMPORTANCE_COLUMN){
-		return g_strdup_printf("%d", (int) value);
+		return g_strdup_printf("%d", (gint) value);
 	} else {
 		return g_strdup(value);
 	}
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 9c62064b27..d897d16f85 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -575,7 +575,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, doub
 /*
  * Handles the events on the ETableFieldChooserItem
  */
-static int
+static gint
 etfci_event (GnomeCanvasItem *item, GdkEvent *e)
 {
 	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 4975d6dee5..29cd2b94d7 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -198,7 +198,7 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header
 }
 
 
-static int
+static gint
 etgc_event (GnomeCanvasItem *item, GdkEvent *event)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(item);
@@ -572,7 +572,7 @@ etgc_remove (ETableGroup *etg, gint row)
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
 	GList *list;
 
-	for (list = etgc->children ; list; list = g_list_next (list)) {
+	for (list = etgc->children; list; list = g_list_next (list)) {
 		ETableGroupContainerChildNode *child_node = list->data;
 		ETableGroup                   *child = child_node->child;
 
@@ -593,7 +593,7 @@ etgc_remove (ETableGroup *etg, gint row)
 	return FALSE;
 }
 
-static int
+static gint
 etgc_row_count (ETableGroup *etg)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
@@ -613,7 +613,7 @@ etgc_increment (ETableGroup *etg, gint position, gint amount)
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
 	GList *list = etgc->children;
 
-	for (list = etgc->children ; list; list = g_list_next (list))
+	for (list = etgc->children; list; list = g_list_next (list))
 		e_table_group_increment (((ETableGroupContainerChildNode *)list->data)->child,
 					 position, amount);
 }
@@ -624,7 +624,7 @@ etgc_decrement (ETableGroup *etg, gint position, gint amount)
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
 	GList *list = etgc->children;
 
-	for (list = etgc->children ; list; list = g_list_next (list))
+	for (list = etgc->children; list; list = g_list_next (list))
 		e_table_group_decrement (((ETableGroupContainerChildNode *)list->data)->child,
 					 position, amount);
 }
@@ -1220,8 +1220,8 @@ e_table_group_container_print_page  (EPrintable *ep,
 		cairo_save (cr);
 		cairo_rectangle (cr, 0, 0, width,TEXT_AREA_HEIGHT);
 		cairo_rectangle (cr, 0, 0, 2 * TEXT_AREA_HEIGHT, child_height + TEXT_AREA_HEIGHT);
-		cairo_set_source_rgb (cr, .7, .7, .7) ;
-		cairo_fill(cr) ;
+		cairo_set_source_rgb (cr, .7, .7, .7);
+		cairo_fill(cr);
 		cairo_restore (cr);
 
 		cairo_save (cr);
@@ -1245,7 +1245,7 @@ e_table_group_container_print_page  (EPrintable *ep,
 		pango_cairo_show_layout (cr, layout);
 		g_free(string);
 
-		cairo_translate(cr, 2 * TEXT_AREA_HEIGHT, TEXT_AREA_HEIGHT) ;
+		cairo_translate(cr, 2 * TEXT_AREA_HEIGHT, TEXT_AREA_HEIGHT);
 		cairo_move_to(cr, 0, 0);
 		cairo_rectangle (cr, 0, 0, width - 2 * TEXT_AREA_HEIGHT,child_height);
 		cairo_clip(cr);
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 5e269e284e..61d357aaf2 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -363,7 +363,7 @@ etgl_decrement (ETableGroup *etg, gint position, gint amount)
 	}
 }
 
-static int
+static gint
 etgl_row_count (ETableGroup *etg)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index a1d965b57a..7d3499f8f0 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -590,7 +590,7 @@ e_table_group_get_header (ETableGroup *etg)
 	return etg->header;
 }
 
-static int
+static gint
 etg_event (GnomeCanvasItem *item, GdkEvent *event)
 {
 	ETableGroup *etg = E_TABLE_GROUP (item);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 51bd49a37b..190fccb846 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -151,7 +151,7 @@ ethi_dispose (GObject *object){
 		(*G_OBJECT_CLASS (ethi_parent_class)->dispose) (object);
 }
 
-static int
+static gint
 e_table_header_item_get_height (ETableHeaderItem *ethi)
 {
 	ETableHeader *eth;
@@ -387,7 +387,7 @@ ethi_get_property (GObject *object,
 	}
 }
 
-static int
+static gint
 ethi_find_col_by_x (ETableHeaderItem *ethi, gint x)
 {
 	const gint cols = e_table_header_count (ethi->eth);
@@ -417,7 +417,7 @@ ethi_find_col_by_x (ETableHeaderItem *ethi, gint x)
 	return cols - 1;
 }
 
-static int
+static gint
 ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, gint x)
 {
 	const gint cols = e_table_header_count (ethi->eth);
@@ -1685,7 +1685,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 /*
  * Handles the events on the ETableHeaderItem, particularly it handles resizing
  */
-static int
+static gint
 ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
@@ -1782,7 +1782,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			gint width = 0;
 			g_signal_emit_by_name (ethi->eth,
 					       "request_width",
-					       (int)ethi->resize_col, &width);
+					       (gint)ethi->resize_col, &width);
 			/* Add 10 to stop it from "..."ing */
 			e_table_header_set_size (ethi->eth, ethi->resize_col, width + 10);
 
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 7976289020..5d6ed5cb36 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -67,7 +67,7 @@ build_header_layout (GtkWidget *widget, const gchar *str)
  *
  * Return value: The height of the button, in pixels.
  **/
-double
+gdouble
 e_table_header_compute_height (ETableCol *ecol, GtkWidget *widget)
 {
 	gint ythick;
@@ -98,7 +98,7 @@ e_table_header_compute_height (ETableCol *ecol, GtkWidget *widget)
 	return height;
 }
 
-double
+gdouble
 e_table_header_width_extras (GtkStyle *style)
 {
 	g_return_val_if_fail (style != NULL, -1);
@@ -179,7 +179,7 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc,
 				else
 					xfactor = width;
 
-				p[3] = ((int) p[3] * xfactor * yfactor / (width * height));
+				p[3] = ((gint) p[3] * xfactor * yfactor / (width * height));
 				p += 4;
 			}
 		}
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index 7804bd12c5..60b373ef7f 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -32,9 +32,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
-double  e_table_header_compute_height (ETableCol *ecol,
+gdouble  e_table_header_compute_height (ETableCol *ecol,
 				       GtkWidget *widget);
-double  e_table_header_width_extras    (GtkStyle       *style);
+gdouble  e_table_header_width_extras    (GtkStyle       *style);
 void    e_table_header_draw_button     (GdkDrawable    *drawable,
 					ETableCol      *ecol,
 					GtkStyle       *style,
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 461cacf4c2..c5cfa1878f 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -609,7 +609,7 @@ eti_remove_header_model (ETableItem *eti)
  * Returns the height used by row @row.  This does not include the one-pixel
  * used as a separator between rows
  */
-static int
+static gint
 eti_row_height_real (ETableItem *eti, gint row)
 {
 	const gint cols = e_table_header_count (eti->header);
@@ -698,7 +698,7 @@ calculate_height_cache (ETableItem *eti)
  * Returns the height used by row @row.  This does not include the one-pixel
  * used as a separator between rows
  */
-static int
+static gint
 eti_row_height (ETableItem *eti, gint row)
 {
 	if (eti->uniform_row_height) {
@@ -734,7 +734,7 @@ eti_row_height (ETableItem *eti, gint row)
  * when the height is computed by using the first row as the size for
  * every other row in the ETableItem.
  */
-static int
+static gint
 eti_get_height (ETableItem *eti)
 {
 	const gint rows = eti->rows;
@@ -1169,7 +1169,7 @@ eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, E
 	if (eti->height_cache) {
 		gint i;
 		eti->height_cache = g_renew(int, eti->height_cache, eti->rows);
-		memmove(eti->height_cache + row + count, eti->height_cache + row, (eti->rows - count - row) * sizeof(int));
+		memmove(eti->height_cache + row + count, eti->height_cache + row, (eti->rows - count - row) * sizeof(gint));
 		for (i = row; i < row + count; i++)
 			eti->height_cache[i] = -1;
 	}
@@ -1195,7 +1195,7 @@ eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ET
 	eti->rows = e_table_model_row_count (eti->table_model);
 
 	if (eti->height_cache && (eti->rows > row)) {
-		memmove(eti->height_cache + row, eti->height_cache + row + count, (eti->rows - row) * sizeof(int));
+		memmove(eti->height_cache + row, eti->height_cache + row + count, (eti->rows - row) * sizeof(gint));
 	}
 
 	eti_unfreeze (eti);
@@ -1372,7 +1372,7 @@ eti_header_structure_changed (ETableHeader *eth, ETableItem *eti)
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
 }
 
-static int
+static gint
 eti_request_column_width (ETableHeader *eth, gint col, ETableItem *eti)
 {
 	gint width = 0;
@@ -2222,7 +2222,7 @@ eti_cursor_move_right (ETableItem *eti)
 }
 
 #ifdef DO_TOOLTIPS
-static int
+static gint
 _do_tooltip (ETableItem *eti)
 {
 	ECellView *ecell_view;
@@ -2312,7 +2312,7 @@ eti_e_cell_event     (ETableItem *item, ECellView *ecell_view, GdkEvent *event,
 }
 
 /* FIXME: cursor */
-static int
+static gint
 eti_event (GnomeCanvasItem *item, GdkEvent *e)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
@@ -2674,7 +2674,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 		gint cursor_row, cursor_col;
 		gint handled = TRUE;
 
-		d(g_print("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (int) e->key.keyval));
+		d(g_print("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
 
 		g_object_get(eti->selection,
 			     "cursor_row", &cursor_row,
@@ -2881,7 +2881,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 	case GDK_KEY_RELEASE: {
 		gint cursor_row, cursor_col;
 
-		d(g_print("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (int) e->key.keyval));
+		d(g_print("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
 
 		g_object_get(eti->selection,
 			     "cursor_row", &cursor_row,
@@ -3464,7 +3464,7 @@ e_table_item_compute_mouse_over (ETableItem        *eti,
 
 	gnome_canvas_item_w2i (GNOME_CANVAS_ITEM (eti), &realx, &realy);
 
-	if (!find_cell (eti, (int)realx, (int)realy, col, row, NULL, NULL)) {
+	if (!find_cell (eti, (gint)realx, (gint)realy, col, row, NULL, NULL)) {
 		*row = -1;
 		*col = -1;
 	}
@@ -3590,7 +3590,7 @@ e_table_item_print_page  (EPrintable *ep,
 	}
 	yd++;
 
-	for (row = rows_printed; row < rows ; row++){
+	for (row = rows_printed; row < rows; row++){
 		gdouble xd = 1, row_height;
 		row_height = eti_printed_row_height(eti, widths, context, row);
 
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index f149656fac..92e8e0c2fd 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -227,9 +227,9 @@ void        e_table_item_get_cell_geometry   (ETableItem        *eti,
 					      gint               *width,
 					      gint               *height);
 
-int	    e_table_item_row_diff	     (ETableItem	*eti,
-					      int		 start_row,
-					      int		 end_row);
+gint	    e_table_item_row_diff	     (ETableItem	*eti,
+					      gint		 start_row,
+					      gint		 end_row);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index c06303ca4b..d39a396c64 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -29,7 +29,7 @@
 
 G_DEFINE_TYPE (ETableMemoryCalbacks, e_table_memory_callbacks, E_TABLE_MEMORY_TYPE)
 
-static int
+static gint
 etmc_column_count (ETableModel *etm)
 {
 	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 622de851c0..95ea4bee99 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -87,7 +87,7 @@ free_value (ETableMemoryStore *etms, gint col, gpointer value)
 }
 
 
-static int
+static gint
 etms_column_count (ETableModel *etm)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm);
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 98fd65c460..8eb6a3e30c 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -64,7 +64,7 @@ etmm_finalize (GObject *object)
 	G_OBJECT_CLASS (e_table_memory_parent_class)->finalize (object);
 }
 
-static int
+static gint
 etmm_row_count (ETableModel *etm)
 {
 	ETableMemory *etmm = E_TABLE_MEMORY (etm);
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index c8cea32963..a604e7a590 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -29,7 +29,7 @@
 
 G_DEFINE_TYPE (ETableOne, e_table_one, E_TABLE_MODEL_TYPE)
 
-static int
+static gint
 one_column_count (ETableModel *etm)
 {
 	ETableOne *one = E_TABLE_ONE(etm);
@@ -40,7 +40,7 @@ one_column_count (ETableModel *etm)
 		return 0;
 }
 
-static int
+static gint
 one_row_count (ETableModel *etm)
 {
 	return 1;
diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c
index f2eceb9314..2980bec7c0 100644
--- a/widgets/table/e-table-simple.c
+++ b/widgets/table/e-table-simple.c
@@ -30,7 +30,7 @@
 
 G_DEFINE_TYPE (ETableSimple, e_table_simple, E_TABLE_MODEL_TYPE)
 
-static int
+static gint
 simple_column_count (ETableModel *etm)
 {
 	ETableSimple *simple = E_TABLE_SIMPLE(etm);
@@ -41,7 +41,7 @@ simple_column_count (ETableModel *etm)
 		return 0;
 }
 
-static int
+static gint
 simple_row_count (ETableModel *etm)
 {
 	ETableSimple *simple = E_TABLE_SIMPLE(etm);
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index c4d5574dbc..4676db8ac4 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -133,7 +133,7 @@ etsv_add       (ETableSubsetVariable *etssv,
 
 	if (etss->n_map + 1 > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof(int));
+		etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof(gint));
 	}
 	i = etss->n_map;
 	if (etsv->sort_idle_id == 0) {
@@ -149,7 +149,7 @@ etsv_add       (ETableSubsetVariable *etssv,
 				etsv->insert_idle_id = g_idle_add_full(40, (GSourceFunc) etsv_insert_idle, etsv, NULL);
 			}
 			i = e_table_sorting_utils_insert(etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map, row);
-			memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
+			memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(gint));
 		}
 	}
 	etss->map_table[i] = row;
@@ -173,7 +173,7 @@ etsv_add_all   (ETableSubsetVariable *etssv)
 
 	if (etss->n_map + rows > etssv->n_vals_allocated){
 		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
+		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
 	for (i = 0; i < rows; i++)
 		etss->map_table[etss->n_map++] = i;
diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
index 48bb0e3aa0..c778af3c1f 100644
--- a/widgets/table/e-table-sorted-variable.h
+++ b/widgets/table/e-table-sorted-variable.h
@@ -48,8 +48,8 @@ typedef struct {
 
 	gint              sort_info_changed_id;
 	gint              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
+	gint		 insert_idle_id;
+	gint		 insert_count;
 
 } ETableSortedVariable;
 
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index ae9bbbd3eb..16bb3cf888 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -218,7 +218,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row
 		}
 	}
 
-	etss->map_table = g_realloc (etss->map_table, (etss->n_map + count) * sizeof(int));
+	etss->map_table = g_realloc (etss->map_table, (etss->n_map + count) * sizeof(gint));
 
 	for (; count > 0; count --) {
 		if (!full_change)
@@ -237,7 +237,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row
 					ets->insert_idle_id = g_idle_add_full(40, (GSourceFunc) ets_insert_idle, ets, NULL);
 				}
 				i = e_table_sorting_utils_insert(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map, row);
-				memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
+				memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(gint));
 			}
 		}
 		etss->map_table[i] = row;
@@ -271,7 +271,7 @@ ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row,
 			if (etss->map_table[i] == row + j) {
 				if (shift)
 					e_table_model_pre_change (etm);
-				memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int));
+				memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(gint));
 				etss->n_map --;
 				if (shift)
 					e_table_model_row_deleted (etm, i);
diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h
index cb802768d8..a9e815ef3a 100644
--- a/widgets/table/e-table-sorted.h
+++ b/widgets/table/e-table-sorted.h
@@ -48,8 +48,8 @@ typedef struct {
 
 	gint              sort_info_changed_id;
 	gint              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
+	gint		 insert_idle_id;
+	gint		 insert_count;
 
 } ETableSorted;
 
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 4d3148a902..766d94dd58 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -161,11 +161,11 @@ ets_class_init (ETableSorterClass *klass)
 	object_class->set_property              = ets_set_property;
 	object_class->get_property              = ets_get_property;
 
-	sorter_class->model_to_sorted           = ets_model_to_sorted           ;
-	sorter_class->sorted_to_model           = ets_sorted_to_model           ;
-	sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array ;
-	sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array ;
-	sorter_class->needs_sorting             = ets_needs_sorting             ;
+	sorter_class->model_to_sorted           = ets_model_to_sorted;
+	sorter_class->sorted_to_model           = ets_sorted_to_model;
+	sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array;
+	sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array;
+	sorter_class->needs_sorting             = ets_needs_sorting;
 
 	g_object_class_install_property (object_class, PROP_SORT_INFO,
 					 g_param_spec_object ("sort_info",
@@ -268,7 +268,7 @@ static GCompareFunc *compare_closure;
 
 /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
 
-static int
+static gint
 qsort_callback(gconstpointer data1, gconstpointer data2)
 {
 	gint row1 = *(gint *)data1;
@@ -355,7 +355,7 @@ ets_sort(ETableSorter *ets)
 		ascending_closure[j] = column.ascending;
 	}
 
-		qsort(ets->sorted, rows, sizeof(int), qsort_callback);
+		qsort(ets->sorted, rows, sizeof(gint), qsort_callback);
 
 	g_free(vals_closure);
 	g_free(ascending_closure);
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index a8ab92bf94..cf1b503b09 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -31,7 +31,7 @@
 #define d(x)
 
 /* This takes source rows. */
-static int
+static gint
 etsu_compare(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint row1, gint row2)
 {
 	gint j;
@@ -77,7 +77,7 @@ typedef struct {
 
 /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
 
-static int
+static gint
 e_sort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
 	gint row1 = *(gint *)data1;
@@ -142,7 +142,7 @@ e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETabl
 	}
 
 	g_qsort_with_data (
-		map_table, rows, sizeof(int), e_sort_callback, &closure);
+		map_table, rows, sizeof(gint), e_sort_callback, &closure);
 
 	g_free(closure.vals);
 	g_free(closure.ascending);
@@ -218,7 +218,7 @@ e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_
 
 
 /* This takes source rows. */
-static int
+static gint
 etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2)
 {
 	gint j;
@@ -243,7 +243,7 @@ etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *f
 	return comp_val;
 }
 
-static int
+static gint
 e_sort_tree_callback(gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
 	ETreePath *path1 = *(ETreePath *)data1;
@@ -296,7 +296,7 @@ e_table_sorting_utils_tree_sort(ETreeModel *source, ETableSortInfo *sort_info, E
 	}
 
 	g_qsort_with_data (
-		map, count, sizeof(int), e_sort_callback, &closure);
+		map, count, sizeof(gint), e_sort_callback, &closure);
 
 	map_copy = g_new(ETreePath, count);
 	for (i = 0; i < count; i++) {
@@ -340,8 +340,8 @@ e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *s
 gint
 e_table_sorting_utils_tree_insert(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count, ETreePath path)
 {
-	size_t start;
-	size_t end;
+	gsize start;
+	gsize end;
 	ETreeSortClosure closure;
 
 	closure.tree = source;
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 93faeac0f8..de1d7ccacf 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -48,7 +48,7 @@ etssv_add       (ETableSubsetVariable *etssv,
 
 	if (etss->n_map + 1 > etssv->n_vals_allocated){
 		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
+		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
 
 	etss->map_table[etss->n_map++] = row;
@@ -69,7 +69,7 @@ etssv_add_array (ETableSubsetVariable *etssv,
 
 	if (etss->n_map + count > etssv->n_vals_allocated){
 		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, count);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
+		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
 	for (i = 0; i < count; i++)
 		etss->map_table[etss->n_map++] = array[i];
@@ -90,7 +90,7 @@ etssv_add_all   (ETableSubsetVariable *etssv)
 	rows = e_table_model_row_count(etss->source);
 	if (etss->n_map + rows > etssv->n_vals_allocated){
 		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
+		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
 	for (i = 0; i < rows; i++)
 		etss->map_table[etss->n_map++] = i;
@@ -109,7 +109,7 @@ etssv_remove    (ETableSubsetVariable *etssv,
 	for (i = 0; i < etss->n_map; i++){
 		if (etss->map_table[i] == row) {
 			e_table_model_pre_change (etm);
-			memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int));
+			memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(gint));
 			etss->n_map --;
 
 			e_table_model_row_deleted (etm, i);
@@ -253,6 +253,6 @@ e_table_subset_variable_set_allocation (ETableSubsetVariable *etssv,
 	if (total <= 0)
 		total = 1;
 	if (total > etss->n_map){
-		etss->map_table = g_realloc (etss->map_table, total * sizeof(int));
+		etss->map_table = g_realloc (etss->map_table, total * sizeof(gint));
 	}
 }
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index bf137e0ef8..a860aba24f 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -131,7 +131,7 @@ etss_finalize (GObject *object)
 	G_OBJECT_CLASS (etss_parent_class)->finalize (object);
 }
 
-static int
+static gint
 etss_column_count (ETableModel *etm)
 {
 	ETableSubset *etss = (ETableSubset *)etm;
@@ -139,7 +139,7 @@ etss_column_count (ETableModel *etm)
 	return e_table_model_column_count (etss->source);
 }
 
-static int
+static gint
 etss_row_count (ETableModel *etm)
 {
 	ETableSubset *etss = (ETableSubset *)etm;
@@ -394,7 +394,7 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, gint nvals)
 	gint i;
 
 	if (nvals) {
-		buffer = (guint *) g_malloc (sizeof (unsigned int) * nvals);
+		buffer = (guint *) g_malloc (sizeof (guint) * nvals);
 		if (buffer == NULL)
 			return NULL;
 	} else
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index fc7cb101ec..a53ada3589 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -114,7 +114,7 @@ remove_row (ETableWithout *etw, gint view_row)
 	ETableSubset *etss = E_TABLE_SUBSET (etw);
 
 	e_table_model_pre_change (E_TABLE_MODEL (etw));
-	memmove (etss->map_table + view_row, etss->map_table + view_row + 1, (etss->n_map - view_row - 1) * sizeof (int));
+	memmove (etss->map_table + view_row, etss->map_table + view_row + 1, (etss->n_map - view_row - 1) * sizeof (gint));
 	etss->n_map --;
 	e_table_model_row_deleted (E_TABLE_MODEL (etw), view_row);
 }
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 549a4ca6e6..7f756d95a4 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -690,8 +690,8 @@ table_canvas_reflow_idle (ETable *e_table)
 		      "height", &height,
 		      "width", &width,
 		      NULL);
-	height = MAX ((int)height, alloc->height);
-	width = MAX((int)width, alloc->width);
+	height = MAX ((gint)height, alloc->height);
+	width = MAX((gint)width, alloc->width);
 	/* I have no idea why this needs to be -1, but it works. */
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_table->table_canvas),
 					NULL, NULL, &oldwidth, &oldheight);
@@ -720,7 +720,7 @@ table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 	g_object_get (e_table->canvas_vbox,
 		      "height", &height,
 		      NULL);
-	height = MAX ((int)height, alloc->height);
+	height = MAX ((gint)height, alloc->height);
 
 	g_object_set (e_table->canvas_vbox,
 		      "width", width,
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 562a47386c..e961a067ca 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -39,7 +39,7 @@ etmc_icon_at (ETreeModel *etm, ETreePath node)
 	return etmc->icon_at (etm, node, etmc->model_data);
 }
 
-static int
+static gint
 etmc_column_count (ETreeModel *etm)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 54bd7b77f5..8cd2f06cb9 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -84,7 +84,7 @@ check_children (ETreeMemory *memory, ETreePath node)
 	}
 }
 
-static int
+static gint
 e_tree_memory_path_depth (ETreeMemoryPath *path)
 {
 	gint depth = 0;
@@ -636,7 +636,7 @@ typedef struct {
 	ETreeMemorySortCallback callback;
 } MemoryAndClosure;
 
-static int
+static gint
 sort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
 	ETreePath path1 = *(ETreePath *)data1;
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 3bb4375b4d..87140ef30a 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -455,7 +455,7 @@ etsm_selected_count (ESelectionModel *selection)
 	return g_hash_table_size (etsm->priv->paths);
 }
 
-static int
+static gint
 etsm_row_count (ESelectionModel *selection)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
@@ -783,23 +783,23 @@ e_tree_selection_model_class_init (ETreeSelectionModelClass *klass)
 	object_class->get_property = etsm_get_property;
 	object_class->set_property = etsm_set_property;
 
-	esm_class->is_row_selected    = etsm_is_row_selected    ;
-	esm_class->foreach            = etsm_foreach            ;
-	esm_class->clear              = etsm_clear              ;
-	esm_class->selected_count     = etsm_selected_count     ;
-	esm_class->select_all         = etsm_select_all         ;
-	esm_class->invert_selection   = etsm_invert_selection   ;
-	esm_class->row_count          = etsm_row_count          ;
-
-	esm_class->change_one_row     = etsm_change_one_row     ;
-	esm_class->change_cursor      = etsm_change_cursor      ;
-	esm_class->cursor_row         = etsm_cursor_row         ;
-	esm_class->cursor_col         = etsm_cursor_col         ;
-
-	esm_class->select_single_row  = etsm_select_single_row  ;
-	esm_class->toggle_single_row  = etsm_toggle_single_row  ;
-	esm_class->move_selection_end = etsm_move_selection_end ;
-	esm_class->set_selection_end  = etsm_set_selection_end  ;
+	esm_class->is_row_selected    = etsm_is_row_selected;
+	esm_class->foreach            = etsm_foreach;
+	esm_class->clear              = etsm_clear;
+	esm_class->selected_count     = etsm_selected_count;
+	esm_class->select_all         = etsm_select_all;
+	esm_class->invert_selection   = etsm_invert_selection;
+	esm_class->row_count          = etsm_row_count;
+
+	esm_class->change_one_row     = etsm_change_one_row;
+	esm_class->change_cursor      = etsm_change_cursor;
+	esm_class->cursor_row         = etsm_cursor_row;
+	esm_class->cursor_col         = etsm_cursor_col;
+
+	esm_class->select_single_row  = etsm_select_single_row;
+	esm_class->toggle_single_row  = etsm_toggle_single_row;
+	esm_class->move_selection_end = etsm_move_selection_end;
+	esm_class->set_selection_end  = etsm_set_selection_end;
 
 	g_object_class_install_property (object_class, PROP_CURSOR_ROW,
 					 g_param_spec_int ("cursor_row",
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
index b71f108a7d..a1668dc542 100644
--- a/widgets/table/e-tree-simple.c
+++ b/widgets/table/e-tree-simple.c
@@ -27,7 +27,7 @@
 
 #include "e-tree-simple.h"
 
-static int
+static gint
 simple_column_count (ETableModel *etm)
 {
 	ETreeSimple *simple = E_TREE_SIMPLE(etm);
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index d9901e611b..822affeee8 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -211,7 +211,7 @@ etsv_sort_info_changed (ETableSortInfo *info, ETreeSortedVariable *etsv)
 }
 
 /* This takes source rows. */
-static int
+static gint
 etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath *path2)
 {
 	gint j;
@@ -249,7 +249,7 @@ gint *ascending_closure;
 gint *col_idx_closure;
 GCompareFunc *compare_closure;
 
-static int
+static gint
 etsv_compare_closure(const ETreePath *path1, const ETreePath *path2)
 {
 	gint j;
@@ -275,7 +275,7 @@ etsv_compare_closure(const ETreePath *path1, const ETreePath *path2)
 	return comp_val;
 }
 
-static int
+static gint
 qsort_callback(gconstpointer data1, gconstpointer data2)
 {
 	GNode *node1 = *(GNode **)data1;
@@ -283,7 +283,7 @@ qsort_callback(gconstpointer data1, gconstpointer data2)
 	return etsv_compare_closure(node1->data, node2->data);
 }
 
-static int
+static gint
 qsort_callback_source(gconstpointer data1, gconstpointer data2)
 {
 	return etsv_compare_closure(data1, data2);
diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h
index 2d5af111d9..1c4de3ed9c 100644
--- a/widgets/table/e-tree-sorted-variable.h
+++ b/widgets/table/e-tree-sorted-variable.h
@@ -51,8 +51,8 @@ typedef struct {
 	gint              table_model_cell_changed_id;
 	gint              sort_info_changed_id;
 	gint              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
+	gint		 insert_idle_id;
+	gint		 insert_count;
 
 } ETreeSortedVariable;
 
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index c72c269471..cd4ef4a537 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -1065,7 +1065,7 @@ ets_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETr
 		}
 		parent_path->num_children ++;
 		parent_path->children = g_renew(ETreeSortedPath *, parent_path->children, parent_path->num_children);
-		memmove(parent_path->children + i + 1, parent_path->children + i, (parent_path->num_children - 1 - i) * sizeof(int));
+		memmove(parent_path->children + i + 1, parent_path->children + i, (parent_path->num_children - 1 - i) * sizeof(gint));
 		parent_path->children[i] = path;
 		for (j = i; j < parent_path->num_children; j++) {
 			parent_path->children[j]->position = j;
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index cac1260681..783f58c4cc 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -73,7 +73,7 @@ struct ETreeTableAdapterPriv {
 
 	gint          pre_change_id;
 	gint          no_change_id;
-	int	     rebuilt_id;
+	gint	     rebuilt_id;
 	gint          node_changed_id;
 	gint          node_data_changed_id;
 	gint          node_col_changed_id;
@@ -259,7 +259,7 @@ update_child_counts(GNode *gnode, gint delta)
 	}
 }
 
-static int
+static gint
 delete_children(ETreeTableAdapter *etta, GNode *gnode)
 {
 	node_t *node = (node_t *)gnode->data;
@@ -566,7 +566,7 @@ etta_dispose (GObject *object)
 	G_OBJECT_CLASS (etta_parent_class)->dispose (object);
 }
 
-static int
+static gint
 etta_column_count (ETableModel *etm)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
@@ -599,7 +599,7 @@ etta_has_change_pending (ETableModel *etm)
 }
 
 
-static int
+static gint
 etta_row_count (ETableModel *etm)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index beb069e5fb..8124a59c64 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -738,8 +738,8 @@ tree_canvas_reflow_idle (ETree *e_tree)
 		      "height", &height,
 		      "width", &width,
 		      NULL);
-	height = MAX ((int)height, alloc->height);
-	width = MAX((int)width, alloc->width);
+	height = MAX ((gint)height, alloc->height);
+	width = MAX((gint)width, alloc->width);
 	/* I have no idea why this needs to be -1, but it works. */
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->priv->table_canvas),
 					NULL, NULL, &oldwidth, &oldheight);
@@ -771,7 +771,7 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 	g_object_get (e_tree->priv->item,
 		      "height", &height,
 		      NULL);
-	height = MAX ((int)height, alloc->height);
+	height = MAX ((gint)height, alloc->height);
 
 	g_object_set (e_tree->priv->item,
 		      "width", width,
@@ -1766,7 +1766,7 @@ et_foreach_recurse (ETreeModel *model,
 	callback(path, closure);
 
 	child = e_tree_model_node_get_first_child(E_TREE_MODEL(model), path);
-	for ( ; child; child = e_tree_model_node_get_next(E_TREE_MODEL(model), child))
+	for (; child; child = e_tree_model_node_get_next(E_TREE_MODEL(model), child))
 		if (child)
 			et_foreach_recurse (model, child, callback, closure);
 }
diff --git a/widgets/text/a11y/gal-a11y-e-text.c b/widgets/text/a11y/gal-a11y-e-text.c
index f5939670f2..99fb4e8a94 100644
--- a/widgets/text/a11y/gal-a11y-e-text.c
+++ b/widgets/text/a11y/gal-a11y-e-text.c
@@ -439,7 +439,7 @@ et_get_text_before_offset (AtkText *text,
 		break;
 	case ATK_TEXT_BOUNDARY_WORD_START:
 		end = find_word_start (full_text, offset - 1, -1);
-		start = find_word_start (full_text, end - 1, -1) ;
+		start = find_word_start (full_text, end - 1, -1);
 		break;
 	case ATK_TEXT_BOUNDARY_WORD_END:
 		end = find_word_end (full_text, offset, -1);
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index cae0f4d3e4..441102ac0f 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -89,7 +89,7 @@ e_reflow_pick_line (EReflow *reflow, double x)
 	return x;
 }
 
-static int
+static gint
 er_find_item (EReflow *reflow, GnomeCanvasItem *item)
 {
 	gint i;
@@ -162,7 +162,7 @@ static gboolean
 do_adjustment (gpointer user_data)
 {
 	gint row;
-	GtkAdjustment *adj ;
+	GtkAdjustment *adj;
 	gfloat value, min_value, max_value;
 	EReflow *reflow = user_data;
 
@@ -389,7 +389,7 @@ item_removed (EReflowModel *model, gint i, EReflow *reflow)
 	if (reflow->items[i])
 		gtk_object_destroy (GTK_OBJECT (reflow->items[i]));
 
-	memmove (reflow->heights + i, reflow->heights + i + 1, (reflow->count - i - 1) * sizeof (int));
+	memmove (reflow->heights + i, reflow->heights + i + 1, (reflow->count - i - 1) * sizeof (gint));
 	memmove (reflow->items + i, reflow->items + i + 1, (reflow->count - i - 1) * sizeof (GnomeCanvasItem *));
 
 	reflow->count --;
@@ -424,7 +424,7 @@ items_inserted (EReflowModel *model, gint position, gint count, EReflow *reflow)
 		reflow->heights = g_renew (int, reflow->heights, reflow->allocated_count);
 		reflow->items = g_renew (GnomeCanvasItem *, reflow->items, reflow->allocated_count);
 	}
-	memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (int));
+	memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (gint));
 	memmove (reflow->items + position + count, reflow->items + position, (reflow->count - position - count) * sizeof (GnomeCanvasItem *));
 	for (i = position; i < position + count; i++) {
 		reflow->items[i] = NULL;
@@ -1126,7 +1126,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	i /= column_width + E_REFLOW_FULL_GUTTER;
 	running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
 
-	for ( ; i < reflow->column_count; i++) {
+	for (; i < reflow->column_count; i++) {
 		if ( running_width > x + width )
 			break;
 		x_rect = running_width;
@@ -1161,7 +1161,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		i /= column_width + E_REFLOW_FULL_GUTTER;
 		running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
 
-		for ( ; i < reflow->column_count; i++) {
+		for (; i < reflow->column_count; i++) {
 			if ( running_width > x + width )
 				break;
 			x_rect = running_width;
@@ -1271,14 +1271,14 @@ e_reflow_point (GnomeCanvasItem *item,
 
 	if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point)
 		distance = GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point (item, x, y, cx, cy, actual_item);
-	if ((int) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item)
+	if ((gint) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item)
 		return distance;
 
 	*actual_item = item;
 	return 0;
 #if 0
 	if (y >= E_REFLOW_BORDER_WIDTH && y <= reflow->height - E_REFLOW_BORDER_WIDTH) {
-		float n_x;
+		gfloat n_x;
 		n_x = x;
 		n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 		n_x = fmod(n_x, (reflow->column_width + E_REFLOW_FULL_GUTTER));
@@ -1337,7 +1337,7 @@ e_reflow_reflow( GnomeCanvasItem *item, gint flags )
 		e_canvas_item_request_parent_reflow(item);
 }
 
-static int
+static gint
 e_reflow_selection_event_real (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
 {
 	gint row;
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 1bc2090caa..e1a0fca438 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -234,7 +234,7 @@ e_text_model_real_insert_length (ETextModel *model, gint position, const gchar *
 
 	for (p = text, l = 0;
 	     l < length;
-	     p = g_utf8_next_char (p), l ++) ;
+	     p = g_utf8_next_char (p), l ++);
 
 	byte_length = p - text;
 
@@ -264,7 +264,7 @@ e_text_model_real_delete (ETextModel *model, gint position, gint length)
 
 	for (p = offs, l = 0;
 	     l < length;
-	     p = g_utf8_next_char (p), l ++) ;
+	     p = g_utf8_next_char (p), l ++);
 
 	byte_length = p - offs;
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 12a1668410..f6371aa551 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1994,8 +1994,8 @@ _do_tooltip (gpointer data)
 	gdk_window_get_origin (GTK_WIDGET(GNOME_CANVAS_ITEM(text)->canvas)->window, &canvas_x, &canvas_y);
 	pixel_origin.x += canvas_x;
 	pixel_origin.y += canvas_y;
-	pixel_origin.x -= (int) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
-	pixel_origin.y -= (int) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
+	pixel_origin.x -= (gint) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
+	pixel_origin.y -= (gint) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
 
 	tooltip_window = gtk_window_new (GTK_WINDOW_POPUP);
 	gtk_container_set_border_width (GTK_CONTAINER (tooltip_window), 1);
@@ -2798,7 +2798,7 @@ e_text_reset_im_context (EText *text)
 
 /* fixme: */
 
-static int
+static gint
 next_word (EText *text, gint start)
 {
 	gchar *p = g_utf8_offset_to_pointer (text->text, start);
@@ -2827,7 +2827,7 @@ next_word (EText *text, gint start)
 	return g_utf8_pointer_to_offset (text->text, p);
 }
 
-static int
+static gint
 find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line)
 {
 	gchar *p;
@@ -2861,7 +2861,7 @@ find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line
 
 /* direction = TRUE (move forward), FALSE (move backward)
    Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */
-static int
+static gint
 _get_updated_position (EText *text, gboolean direction)
 {
 	PangoLogAttr *log_attrs = NULL;
@@ -2927,7 +2927,7 @@ _get_updated_position (EText *text, gboolean direction)
 
 
 
-static int
+static gint
 _get_position(EText *text, ETextEventProcessorCommand *command)
 {
 	gint length, obj_num;