aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/importers/evolution-mbox-importer.c2
-rw-r--r--mail/importers/evolution-outlook-importer.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c25e088ed8..14a68fc46d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-30 Iain Holmes <iain@ximian.com>
+
+ * importers/evolution-mbox-importer.c (load_file_fn): Check if
+ foldername is \0.
+
+ * importers/evolution-outlook-importer.c (load_file_fn): Ditto.
+
2001-03-30 Jon Trowbridge <trow@ximian.com>
* mail-display.c (mail_text_write): Add (commented-out)
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index b1677161c7..dcdf0f75ad 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -197,7 +197,7 @@ load_file_fn (EvolutionImporter *eimporter,
}
importer->mstream = NULL;
- if (folderpath == NULL)
+ if (folderpath == NULL || *folderpath == '\0')
importer->folder = mail_tool_get_local_inbox (NULL);
else
importer->folder = mail_tool_uri_to_folder (folderpath, NULL);
diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c
index 06267992b5..50e386a388 100644
--- a/mail/importers/evolution-outlook-importer.c
+++ b/mail/importers/evolution-outlook-importer.c
@@ -265,7 +265,7 @@ load_file_fn (EvolutionImporter *eimporter,
importer->mstream = NULL;
- if (folderpath == NULL)
+ if (folderpath == NULL || *folderpath == '\0')
importer->folder = mail_tool_get_local_inbox (NULL);
else
importer->folder = mail_tool_uri_to_folder (folderpath, NULL);