aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/importers/mail-importer.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index fa4d235a62..eaf3280b9d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-27 JP Rosevear <jpr@novell.com>
+
+ * importers/mail-importer.c (import_folders_rec): utf8_filename
+ should be char * not char
+
2004-08-27 Hans Petter Jansson <hpj@ximian.com>
* em-utils.c (emu_can_save): Don't crash if we're passed a NULL
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 080ce36491..582efb761a 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -350,11 +350,11 @@ import_folders_rec(struct _import_folders_data *m, const char *filepath, const c
DIR *dir;
struct dirent *d;
struct stat st;
- char *filefull, *foldersub, *uri, utf8_filename;
+ char *filefull, *foldersub, *uri, *utf8_filename;
const char *folder;
dir = opendir(filepath);
- if (dir == NULL)
+ if (dir == NULL)
return;
utf8_filename = g_filename_to_utf8 (filepath, -1, NULL, NULL, NULL);