use mail-importer to import the mail tree, fix the account stuff to talk

2004-02-13  Not Zed  <NotZed@Ximian.com>

        * importers/netscape-importer.c: use mail-importer to import the
        mail tree, fix the account stuff to talk directly to mail config.
        Added cancel button.  etc.  This is completely untested apart from
        compiling with no warnings.

        * importers/mail-importer.c (import_mbox_import): dont re-use the
        exception for syncing.

        * importers/evolution-outlook-importer.c: major reworking.  Some
        platform fixes, runs in another thread, simpler/cleaner main loop.
        This is completely untested apart from compiling with no warnings.

        * importers/evolution-mbox-importer.c (support_format_fn): we dont
        want to check the From_ line case insensitive!
        (create_control_fn): implement this weird api.

2004-02-12  Not Zed  <NotZed@Ximian.com>

        * importers/elm-importer.c: rewrote all importing stuff.

        * importers/mail-importer.c (mail_importer_import_folders_sync):
        split out into a recursive function & entry.  Now handles mozilla
        format stuff with a flag.
        (import_mbox_import): made the cameloperation properly
        save/restore multiple registrations.

svn path=/trunk/; revision=24732

1 files changed, 9 insertions, 9 deletions

diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 9ce7f4520a..519f1beffd 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -317,7 +317,7 @@ pine_import_import(struct _mail_msg *mm)
 		char *path;
 
 		path = g_build_filename(g_get_home_dir(), "mail", NULL);
-		mail_importer_import_folders_sync(path, NULL, pine_special_folders, m->importer->cancel);
+		mail_importer_import_folders_sync(path, pine_special_folders, 0, m->importer->cancel);
 		g_free(path);
 	}
 }
@@ -430,10 +430,13 @@ pine_destroy_cb (PineImporter *importer, GtkObject *object)
 
 	if (importer->status_timeout_id)
 		g_source_remove(importer->status_timeout_id);
+	g_free(importer->status_what);
 	g_mutex_free(importer->status_lock);
 
 	if (importer->dialog)
 		gtk_widget_destroy(importer->dialog);
+
+	g_free(importer);
 }
 
 /* Fun inity stuff */
@@ -481,11 +484,8 @@ pine_intelligent_importer_new(void)
 			   "Would you like to import them into Evolution?");
 
 	pine = g_new0 (PineImporter, 1);
-
 	pine->status_lock = g_mutex_new();
-
-	pine_restore_settings (pine);
-
+	pine_restore_settings(pine);
 	importer = evolution_intelligent_importer_new (pine_can_import,
 						       pine_create_structure,
 						       _("Pine"),
@@ -493,8 +493,8 @@ pine_intelligent_importer_new(void)
 	g_object_weak_ref((GObject *)importer, (GWeakNotify)pine_destroy_cb, pine);
 	pine->ii = importer;
 
-	control = create_checkboxes_control (pine);
-	bonobo_object_add_interface (BONOBO_OBJECT (importer),
-				     BONOBO_OBJECT (control));
-	return BONOBO_OBJECT (importer);
+	control = create_checkboxes_control(pine);
+	bonobo_object_add_interface(BONOBO_OBJECT(importer), BONOBO_OBJECT(control));
+
+	return BONOBO_OBJECT(importer);
 }