Some netscape and pine fixes

svn path=/trunk/; revision=14346

3 files changed, 10 insertions, 47 deletions

diff --git a/importers/ChangeLog b/importers/ChangeLog
index b1a3b75276..e8b46c317e 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-29  Iain Holmes  <iain@ximian.com>
+
+	* pine-importer.c (pine_can_import): Remove the checks to see if we've
+	run before.
+	(pine_import_file): Remove the return if folder.
+
+	* netscape-importer.c (netscape_can_import): Remove the checks to see if
+	we've run before.
+
 2001-09-25  Iain Holmes  <iain@ximian.com>
 
 	* netscape-importer.c (netscape_import_accounts): Handle the case when 
diff --git a/importers/netscape-importer.c b/importers/netscape-importer.c
index 24e8548bca..4e6df275b3 100644
--- a/importers/netscape-importer.c
+++ b/importers/netscape-importer.c
@@ -595,21 +595,6 @@ netscape_can_import (EvolutionIntelligentImporter *ii,
 	NetscapeImporter *importer = closure;
 	gboolean mail, settings;
 
-	mail = bonobo_config_get_boolean_with_default (importer->db,
-                "/Importer/Netscape/mail-imported", FALSE, NULL);
-	settings = bonobo_config_get_boolean_with_default (importer->db,
-                "/Importer/Netscape/settings-imported", FALSE, NULL);
-
-	if (settings && mail)
-		return FALSE;
-
-	importer->do_mail = !mail;
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->mail), 
-				      importer->do_mail);
-	importer->do_settings = !settings;
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->settings),
-				      importer->do_settings);
-
 	if (user_prefs == NULL) {
 		netscape_init_prefs ();
 	}
diff --git a/importers/pine-importer.c b/importers/pine-importer.c
index 170d84fe3c..ab00c7d0ab 100644
--- a/importers/pine-importer.c
+++ b/importers/pine-importer.c
@@ -313,7 +313,7 @@ importer_cb (EvolutionImporterListener *listener,
 
 	if (result == EVOLUTION_IMPORTER_NOT_READY ||
 	    result == EVOLUTION_IMPORTER_BUSY) {
-		gtk_timeout_add (5000, importer_timeout_fn, data);
+		gtk_timeout_add (1000, importer_timeout_fn, data);
 		return;
 	}
 
@@ -380,10 +380,6 @@ pine_import_file (PineImporter *importer,
 		return FALSE;
 	}
 
-	if (folder == TRUE) {
-		return FALSE;
-	}
-	
 	importer->listener = evolution_importer_listener_new (importer_cb,
 							      importer);
 	objref = bonobo_object_corba_objref (BONOBO_OBJECT (importer->listener));
@@ -406,16 +402,6 @@ pine_can_import (EvolutionIntelligentImporter *ii,
 	gboolean mail;
 	gboolean md_exists, addr_exists;
 
-	/* Already imported */
-
-	mail = bonobo_config_get_boolean_with_default (importer->db,
-                "/Importer/Pine/mail-imported", FALSE, NULL);
-
-	if (mail)
-		return FALSE;
-
-	importer->do_mail = !mail;
-
 	maildir = gnome_util_prepend_user_home ("mail");
 	md_exists = g_file_exists (maildir);
 	importer->do_mail = md_exists;
@@ -444,23 +430,6 @@ import_next (PineImporter *importer)
 		data = importer->dir_list->data;
 
 		folder = g_concat_dir_and_file (data->parent, data->foldername);
-#if 0
-		while (pine_import_file (importer, data->path, folder, data->folder) == FALSE) {
-			g_free (folder);
-			g_free (data->parent);
-			g_free (data->path);
-			g_free (data->foldername);
-			g_free (data);
-			importer->dir_list = importer->dir_list->next;
-
-			if (importer->dir_list == NULL) {
-				break;
-			}
-
-			data = importer->dir_list->data;
-			folder = g_concat_dir_and_file (data->parent, data->foldername);
-		}
-#endif
 		pine_import_file (importer, data->path, folder, data->folder);
 		g_free (folder);
 		g_free (data->parent);