aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--importers/ChangeLog4
-rw-r--r--importers/netscape-importer.c18
2 files changed, 20 insertions, 2 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog
index 8220a60611..125d28d4e8 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-10 Iain Holmes <iain@ximian.com>
+
+ * netscape-importer.c (netscape_import_accounts): Handle Movemail case.
+
2001-09-07 Iain Holmes <iain@ximian.com>
* pine-importer.c:
diff --git a/importers/netscape-importer.c b/importers/netscape-importer.c
index eb420b146d..400c2de370 100644
--- a/importers/netscape-importer.c
+++ b/importers/netscape-importer.c
@@ -413,7 +413,6 @@ netscape_import_accounts (NetscapeImporter *importer)
/* Create account */
account.name = CORBA_string_dup (username);
- g_free (username);
account.id = id;
account.transport = transport;
@@ -504,6 +503,20 @@ netscape_import_accounts (NetscapeImporter *importer)
CORBA_exception_free (&ev);
g_strfreev (servers);
return;
+ } else {
+ char *url, *path;
+
+ /* Using Movemail */
+ path = getenv ("MAIL");
+ url = g_strconcat ("mbox://", path, NULL);
+ source.url = CORBA_string_dup (url);
+ g_free (url);
+
+ source.keep_on_server = netscape_get_boolean ("mail.leave_on_server");
+ source.auto_check = TRUE;
+ source.auto_check_time = 10;
+ source.save_passwd = netscape_get_boolean ("mail.remember_password");
+ source.enabled = FALSE;
}
}
account.source = source;
@@ -514,7 +527,8 @@ netscape_import_accounts (NetscapeImporter *importer)
CORBA_exception_free (&ev);
return;
}
-
+
+ g_free (username);
CORBA_exception_free (&ev);
}