diff options
Diffstat (limited to 'importers')
| -rw-r--r-- | importers/ChangeLog | 6 | ||||
| -rw-r--r-- | importers/netscape-importer.c | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog index be705f6e9a..af648d6f94 100644 --- a/importers/ChangeLog +++ b/importers/ChangeLog @@ -1,3 +1,9 @@ +2001-07-12 Iain Holmes <iain@ximian.com> + + * netscape-importer.c (netscape_init_prefs): Ignore comments. + (netscape_import_accounts): Move the accounts.source assignment down a + little bit. Fixes about a zillion bugs. + 2001-07-11 Kjartan Maraas <kmaraas@gnome.org> * Makefile.am: s/GNOMELOCALEDIR/EVOLUTION_LOCALEDIR diff --git a/importers/netscape-importer.c b/importers/netscape-importer.c index d6455fb662..b900642241 100644 --- a/importers/netscape-importer.c +++ b/importers/netscape-importer.c @@ -256,6 +256,14 @@ netscape_init_prefs (void) while (fgets (line, 4096, prefs_handle)) { char *key, *value; + if (*line == 0) { + continue; + } + + if (*line == '/' && line[1] == '/') { + continue; + } + key = netscape_get_key (line); value = netscape_get_value (line); @@ -334,7 +342,6 @@ netscape_import_accounts (NetscapeImporter *importer) account.name = CORBA_string_dup (nstr ? nstr : ""); account.default_account = FALSE; account.id = id; - account.source = source; account.transport = transport; account.drafts_folder_name = CORBA_string_dup (""); @@ -346,6 +353,7 @@ netscape_import_accounts (NetscapeImporter *importer) nstr = netscape_get_string ("network.hosts.pop_server"); if (nstr != NULL && *nstr != 0) { char *url; + gboolean bool; const char *nstr2; nstr2 = netscape_get_string ("mail.pop_name"); @@ -355,9 +363,13 @@ netscape_import_accounts (NetscapeImporter *importer) url = g_strconcat ("pop://", nstr, NULL); } source.url = CORBA_string_dup (url); + bool = netscape_get_boolean ("mail.leave_on_server"); + g_warning ("mail.leave_on_server: %s", bool ? "true" : "false"); source.keep_on_server = netscape_get_boolean ("mail.leave_on_server"); source.auto_check = TRUE; source.auto_check_time = 10; + bool = netscape_get_boolean ("mail.remember_password"); + g_warning ("mail.remember_password: %s", bool ? "true" : "false"); source.save_passwd = netscape_get_boolean ("mail.remember_password"); source.enabled = TRUE; g_free (url); @@ -421,6 +433,7 @@ netscape_import_accounts (NetscapeImporter *importer) return; } } + account.source = source; GNOME_Evolution_MailConfig_addAccount (objref, &account, &ev); if (ev._major != CORBA_NO_EXCEPTION) { |