aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/importers/evolution-mbox-importer.c2
-rw-r--r--mail/importers/evolution-outlook-importer.c2
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/importer/evolution-importer-client.c2
5 files changed, 16 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);
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 8cddf6f148..af5263c2d2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-29 Iain Holmes <iain@ximian.com>
+
+ * importer/evolution-importer-client.c (evolution_importer_client_load_file):
+ Duplicate the folderpath, or set it to \0
+
2001-03-30 Christopher James Lahey <clahey@ximian.com>
* e-shell-folder-selection-dialog.c (dbl_click_cb): Since this is
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 34598227a1..00ec8208b9 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -174,6 +174,7 @@ evolution_importer_client_load_file (EvolutionImporterClient *client,
const char *folderpath)
{
GNOME_Evolution_Importer corba_importer;
+ CORBA_char *folderpath_dup;
gboolean result;
CORBA_Environment ev;
@@ -183,6 +184,7 @@ evolution_importer_client_load_file (EvolutionImporterClient *client,
CORBA_exception_init (&ev);
corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client));
+ folderpath_dup = CORBA_string_dup (folderpath ? folderpath : "");
result = GNOME_Evolution_Importer_loadFile (corba_importer,
filename, folderpath, &ev);
CORBA_exception_free (&ev);