Basically rewrote this, the import tasks run in another thread. It tells

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

        * importers/pine-importer.c: Basically rewrote this, the import
        tasks run in another thread.  It tells you more about what's going
        on, and its cancellable.
        (pine_store_settings): changed the meaning of the settings
        slightly, if set it means we've processed them already.

        * mail-component-factory.c (factory): hook in importer factory
        callback.

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

        * importers/*-importer.c: removed module init, just provide a new
        method.  Updates for api changes.

        * Makefile.am: link mail importers in directly.

        * mail-importer.c: changed to do stuff in-memory with linked
        stuff, moved to importers/.

        * importers/GNOME_Evolution_Mail_Importers.server.in.in: merge all
        importer .server info's here, point them all to the mailer
        factory.  Removed the others.

        * importers/Makefile.am: remove Mailer.idl stuff.  Move all
        importers to a single library.

svn path=/trunk/; revision=24701

1 files changed, 6 insertions, 26 deletions

diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 1386e3a26f..63f282fd48 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -52,10 +52,8 @@
 #include <importer/evolution-importer-client.h>
 #include <importer/GNOME_Evolution_Importer.h>
 
-#include "mail/mail-importer.h"
+#include "mail-importer.h"
 
-#define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory:" BASE_VERSION
-#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION
 #define KEY "elm-mail-imported"
 
 /*#define SUPER_IMPORTER_DEBUG*/
@@ -93,8 +91,6 @@ typedef struct {
 
 static GHashTable *elm_prefs = NULL;
 
-void mail_importer_module_init (void);
-
 static void import_next (ElmImporter *importer);
 
 static GtkWidget *
@@ -121,6 +117,7 @@ elm_store_settings (ElmImporter *importer)
 
 	gconf = gconf_client_get_default ();
 	gconf_client_set_bool (gconf, "/apps/evolution/importer/elm/mail", importer->do_mail, NULL);
+	g_object_unref(gconf);
 }
 
 static void
@@ -172,8 +169,9 @@ elm_import_file (ElmImporter *importer,
 	}
 
 	CORBA_exception_init(&ev);
+#warning "loadFile needs a destination path"
 
-	result = GNOME_Evolution_Importer_loadFile (importer->importer, path, uri, "", &ev);
+	result = GNOME_Evolution_Importer_loadFile (importer->importer, path, &ev);
 	g_free(uri);
 	if (ev._major != CORBA_NO_EXCEPTION || result == FALSE) {
 		g_warning ("Exception here: %s", CORBA_exception_id (&ev));
@@ -535,10 +533,8 @@ create_checkboxes_control (ElmImporter *importer)
 	return control;
 }
 
-static BonoboObject *
-elm_factory_fn (BonoboGenericFactory *_factory,
-		const char *id,
-		void *closure)
+BonoboObject *
+elm_intelligent_importer_new(void)
 {
 	EvolutionIntelligentImporter *importer;
 	BonoboControl *control;
@@ -575,19 +571,3 @@ elm_factory_fn (BonoboGenericFactory *_factory,
 				     BONOBO_OBJECT (control));
 	return BONOBO_OBJECT (importer);
 }
-
-void
-mail_importer_module_init (void)
-{
-	static gboolean initialised = FALSE;
-	BonoboGenericFactory *factory;
-
-	if (initialised == TRUE)
-		return;
-
-	factory = bonobo_generic_factory_new (ELM_INTELLIGENT_IMPORTER_IID,
-					      elm_factory_fn, NULL);
-	if (factory == NULL)
-		g_warning ("Could not initialise Elm Intelligent Mail Importer.");
-	initialised = TRUE;
-}