aboutsummaryrefslogtreecommitdiffstats
path: root/mail/importers/evolution-mbox-importer.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/importers/evolution-mbox-importer.c')
-rw-r--r--mail/importers/evolution-mbox-importer.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index ff6c7dd13b..882ce64b25 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -53,12 +53,12 @@ typedef struct {
EImportTarget *target;
GMutex *status_lock;
- char *status_what;
- int status_pc;
- int status_timeout_id;
+ gchar *status_what;
+ gint status_pc;
+ gint status_timeout_id;
CamelOperation *cancel; /* cancel/status port */
- char *uri;
+ gchar *uri;
} MboxImporter;
static void
@@ -100,11 +100,11 @@ mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
static gboolean
mbox_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
{
- char signature[6];
+ gchar signature[6];
gboolean ret = FALSE;
- int fd, n;
+ gint fd, n;
EImportTargetURI *s;
- char *filename;
+ gchar *filename;
if (target->type != E_IMPORT_TARGET_URI)
return FALSE;
@@ -129,7 +129,7 @@ mbox_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
}
static void
-mbox_status(CamelOperation *op, const char *what, int pc, void *data)
+mbox_status(CamelOperation *op, const gchar *what, gint pc, gpointer data)
{
MboxImporter *importer = data;
@@ -146,11 +146,11 @@ mbox_status(CamelOperation *op, const char *what, int pc, void *data)
}
static gboolean
-mbox_status_timeout(void *data)
+mbox_status_timeout(gpointer data)
{
MboxImporter *importer = data;
- int pc;
- char *what;
+ gint pc;
+ gchar *what;
if (importer->status_what) {
g_mutex_lock(importer->status_lock);
@@ -166,7 +166,7 @@ mbox_status_timeout(void *data)
}
static void
-mbox_import_done(void *data, CamelException *ex)
+mbox_import_done(gpointer data, CamelException *ex)
{
MboxImporter *importer = data;
@@ -183,7 +183,7 @@ static void
mbox_import(EImport *ei, EImportTarget *target, EImportImporter *im)
{
MboxImporter *importer;
- char *filename;
+ gchar *filename;
/* TODO: do we validate target? */