More code cleanup.

3 files changed, 6 insertions, 6 deletions

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;