Merge back eplugin-import-branch.

svn path=/trunk/; revision=29725

10 files changed, 366 insertions, 432 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index bad55eb3d7..640c480f42 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -30,6 +30,37 @@
 	bug 206774, 242154.
 	* gui/widgets/eab-popup.h: Fixes the bug 206774, 242154.
 
+2005-07-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am (SUBDIRS): build importers before the gui code.
+
+	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
+	link to importer plugin builtins.
+
+	* importers/Makefile.am: just build a shared library with all the
+	importers in it, we dont install a plugin, it is just linked to
+	the main app for simplicity.
+
+	* importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in: 
+	* importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
+	removed.
+
+	* importers/evolution-vcard-importer.c: ported
+	to eimport, simplified some logic (why test extensions and then test
+	file content anyway), fixed some memory leaks, etc.
+
+	* importers/evolution-ldif-importer.c (ldif_import): remove
+	progress dialog stuff, move to update e-import api.
+
+2005-07-01  Not Zed  <NotZed@Ximian.com>
+
+	* gui/component/addressbook-component.c
+	(addressbook_component_init): hookup the builtin importer
+	'plugins'.
+
+	* importers/*: fix for importers->eplugin, also added a
+	window/progress dialog and cancel button.
+
 2005-06-25  Harish Krishnaswamy <kharish@novell.com>
 
 	* gui/contact-list-editor/Makefile.am: The previous commit breaks
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index c1ff2aa617..8d70a4f13f 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -3,7 +3,7 @@ CONDUIT_SUBDIR=conduit
 endif
 
 SUBDIRS =	\
-	util printing gui importers tools $(CONDUIT_SUBDIR)
+	util printing importers gui tools $(CONDUIT_SUBDIR)
 
 error_DATA = addressbook.error
 errordir = $(privdatadir)/errors
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 89d7b26dad..41ba12b9a9 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -55,6 +55,7 @@ libevolution_addressbook_la_LIBADD =							\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
 	$(top_builddir)/widgets/menus/libmenus.la					\
 	$(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la		\
+	$(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
 
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 670e5de8ef..fef6f9b7f7 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -32,9 +32,11 @@
 #include "addressbook/gui/contact-editor/eab-editor.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "e-util/e-plugin.h"
+#include "e-util/e-import.h"
 #include "addressbook/gui/widgets/eab-popup.h"
 #include "addressbook/gui/widgets/eab-menu.h"
 #include "addressbook/gui/widgets/eab-config.h"
+#include "addressbook/importers/evolution-addressbook-importers.h"
 
 #include "misc/e-task-bar.h"
 #include "misc/e-info-label.h"
@@ -471,10 +473,16 @@ addressbook_component_init (AddressbookComponent *component)
 #endif
 
 	if (first) {
+		EImportClass *klass;
+
 		first = FALSE;
 		e_plugin_hook_register_type(eab_popup_hook_get_type());
 		e_plugin_hook_register_type(eab_menu_hook_get_type());
 		e_plugin_hook_register_type(eab_config_hook_get_type());
+
+		klass = g_type_class_ref(e_import_get_type());
+		e_import_class_add_importer(klass, evolution_ldif_importer_peek(), NULL, NULL);
+		e_import_class_add_importer(klass, evolution_vcard_importer_peek(), NULL, NULL);
 	}
 }
 
diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
deleted file mode 100644
index f9067f550a..0000000000
--- a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:@VERSION@"
-	    type="shlib"
-	    location="@IMPORTERSDIR@/libevolution-addressbook-ldif-importer@SOEXT@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution LDIF importer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu_name" type="string"
-		       _value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution LDIF importer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
deleted file mode 100644
index 92cc6fbce5..0000000000
--- a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:@VERSION@"
-	    type="shlib"
-	    location="@IMPORTERSDIR@/libevolution-addressbook-vcard-importer@SOEXT@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution VCard Importer"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer:@VERSION@"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu_name" type="string"
-		       _value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution VCard Importer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 3c04c22f37..02f8e366ff 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -1,53 +1,21 @@
-importersdir = $(privlibdir)/evolution-addressbook-importers
 
-importers_LTLIBRARIES = 				\
-	libevolution-addressbook-ldif-importer.la	\
-	libevolution-addressbook-vcard-importer.la
+privlib_LTLIBRARIES = 				\
+	libevolution-addressbook-importers.la
 
 INCLUDES = 						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"		\
 	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
 	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-# VCard Importer
-libevolution_addressbook_vcard_importer_la_SOURCES =	\
-	evolution-vcard-importer.c
+libevolution_addressbook_importers_la_SOURCES = \
+	evolution-ldif-importer.c		\
+	evolution-vcard-importer.c		\
+	evolution-addressbook-importers.h
 
-libevolution_addressbook_vcard_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_addressbook_vcard_importer_la_LIBADD = \
-	$(top_builddir)/shell/importer/libevolution-importer.la 	\
-	$(top_builddir)/e-util/libeutil.la 				\
-	$(IMPORTERS_LIBS)
-
-# LDIF Importer
-libevolution_addressbook_ldif_importer_la_SOURCES =	\
-	evolution-ldif-importer.c
-
-libevolution_addressbook_ldif_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_addressbook_ldif_importer_la_LIBADD = \
-	$(top_builddir)/shell/importer/libevolution-importer.la 	\
+libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
 	$(IMPORTERS_LIBS)
-
-server_in_files = 						\
-	GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in	\
-	GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-BUILT_SOURCES = $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = $(server_in_files)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h
new file mode 100644
index 0000000000..8cff54473f
--- /dev/null
+++ b/addressbook/importers/evolution-addressbook-importers.h
@@ -0,0 +1,3 @@
+
+struct _EImportImporter *evolution_ldif_importer_peek(void);
+struct _EImportImporter *evolution_vcard_importer_peek(void);
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index a2203f7e8b..d5b6aa8dbc 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -10,6 +10,8 @@
  *
  * Multi-line value support, mailing list support, base64 support, and
  * various fixups: Chris Toshok (toshok@ximian.com)
+ *
+ * Made re-entrant, converted to eplugin, Michael Zucchi <notzed@ximian.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -20,34 +22,40 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <gtk/gtkwidget.h>
+#include <glib/gi18n.h>
+
 #include <gtk/gtkvbox.h>
-#include <libgnome/gnome-init.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-control.h>
 
 #include <libebook/e-book.h>
 #include <libedataserverui/e-source-selector.h>
 
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
 #include <libebook/e-destination.h>
 
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:" BASE_VERSION
-#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer:" BASE_VERSION
+#include "e-util/e-import.h"
 
-static GHashTable *dn_contact_hash;
+#include "evolution-addressbook-importers.h"
 
 typedef struct {
-	ESource *primary;
-	
-	GList *contactlist;
-	GList *iterator;
+	EImport *import;
+	EImportTarget *target;
+
+	guint idle_id;
+
+	GHashTable *dn_contact_hash;
+
+	int state;		/* 0 - initial scan, 1 - list cards, 2 - cancelled/complete */
+	FILE *file;
+	gulong size;
+
 	EBook *book;
-	gboolean ready;
+
+	GSList *contacts;
+	GSList *list_contacts;
+	GSList *list_iterator;
 } LDIFImporter;
 
+static void ldif_import_done(LDIFImporter *gci);
+
 static struct {
 	char *ldif_attribute;
 	EContactField contact_field;
@@ -204,7 +212,7 @@ getValue( char **src )
 }
 
 static gboolean
-parseLine (EContact *contact, EContactAddress *address, char **buf)
+parseLine (LDIFImporter *gci, EContact *contact, EContactAddress *address, char **buf)
 {
 	char *ptr;
 	char *colon, *value;
@@ -284,7 +292,7 @@ parseLine (EContact *contact, EContactAddress *address, char **buf)
 		/* handle objectclass/dn/member out here */
 		if (!field_handled) {
 			if (!g_ascii_strcasecmp (ptr, "dn"))
-				g_hash_table_insert (dn_contact_hash, g_strdup(ldif_value->str), contact);
+				g_hash_table_insert (gci->dn_contact_hash, g_strdup(ldif_value->str), contact);
 			else if (!g_ascii_strcasecmp (ptr, "objectclass") && !g_ascii_strcasecmp (ldif_value->str, "groupofnames")) {
 				e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
 			}
@@ -316,7 +324,7 @@ parseLine (EContact *contact, EContactAddress *address, char **buf)
 }
 
 static EContact *
-getNextLDIFEntry( FILE *f )
+getNextLDIFEntry(LDIFImporter *gci, FILE *f )
 {
 	EContact *contact;
 	EContactAddress *address;
@@ -345,7 +353,7 @@ getNextLDIFEntry( FILE *f )
 
 	buf = str->str;
 	while (buf) {
-		if (!parseLine (contact, address, &buf)) {
+		if (!parseLine (gci, contact, address, &buf)) {
 			/* parsing error */
 			g_object_unref (contact);
 			return NULL;
@@ -381,7 +389,7 @@ resolve_list_card (LDIFImporter *gci, EContact *contact)
 	for (l = email; l; l = l->next) {
 		/* mozilla stuffs dn's in the EMAIL list for contact lists */
 		char *dn = l->data;
-		EContact *dn_contact = g_hash_table_lookup (dn_contact_hash, dn);
+		EContact *dn_contact = g_hash_table_lookup (gci->dn_contact_hash, dn);
 
 		/* break list chains here, since we don't support them just yet */
 		if (dn_contact && !e_contact_get (dn_contact, E_CONTACT_IS_LIST)) {
@@ -407,38 +415,6 @@ resolve_list_card (LDIFImporter *gci, EContact *contact)
 	g_list_free (email_attrs);
 }
 
-static GList *
-create_contacts_from_ldif (const char *filename)
-{
-	GList * list = NULL;
-	GList * list_list = NULL;
-	FILE * file;
-	EContact *contact;
-
-	if(!( file = fopen( filename, "r" ) )) {
-		g_warning("Can't open .ldif file");
-		return NULL;
-	}
-
-	dn_contact_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	while ((contact = getNextLDIFEntry (file))) {
-
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			list_list = g_list_append (list_list, contact);
-		else
-			list = g_list_append (list, contact);
-	}
-
-	fclose (file);
-
-	list = g_list_reverse (list);
-	list_list = g_list_reverse (list_list);
-	list = g_list_concat (list, list_list);
-
-	return list;
-}
-
 static void
 add_to_notes (EContact *contact, EContactField field)
 {
@@ -463,101 +439,95 @@ add_to_notes (EContact *contact, EContactField field)
 	g_free (new_text);
 }
 
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
+static gboolean
+ldif_import_contacts(void *d)
 {
-	LDIFImporter *gci = (LDIFImporter *) closure;
+	LDIFImporter *gci = d;
+	FILE * file;
 	EContact *contact;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->contactlist;
-
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
+	GSList *iter;
+	int count = 0;
+
+	/* We process all normal cards immediately and keep the list
+	   ones till the end */
+
+	if (gci->state == 0) {
+		while (count < 50 && (contact = getNextLDIFEntry(gci, file))) {
+			if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
+				gci->list_contacts = g_slist_prepend(gci->list_contacts, contact);
+			} else {
+				add_to_notes(contact, E_CONTACT_OFFICE);
+				add_to_notes(contact, E_CONTACT_SPOUSE);
+				add_to_notes(contact, E_CONTACT_BLOG_URL);
+				e_book_add_contact(gci->book, contact, NULL);
+				gci->contacts = g_slist_prepend(gci->contacts, contact);
+			}
+			count++;
+		}
+		if (contact == NULL) {
+			gci->state = 1;
+			gci->list_iterator = gci->list_contacts;
+		}
 	}
-
-	contact = gci->iterator->data;
-	if (e_contact_get (contact, E_CONTACT_IS_LIST))
-		resolve_list_card (gci, contact);
-	else {
-		/* Work around the fact that these fields no longer show up in the UI */
-		add_to_notes (contact, E_CONTACT_OFFICE);
-		add_to_notes (contact, E_CONTACT_SPOUSE);
-		add_to_notes (contact, E_CONTACT_BLOG_URL);
+	if (gci->state == 1) {
+		for (iter = gci->list_iterator;count < 50 && iter;iter=iter->next) {
+			contact = iter->data;
+			resolve_list_card(gci, contact);
+			e_book_add_contact(gci->book, contact, NULL);
+			count++;
+		}
+		gci->list_iterator = iter;
+		if (iter == NULL)
+			gci->state = 2;
 	}
-
-	/* FIXME Error checking */
-	e_book_add_contact (gci->book, contact, NULL);
-
-	gci->iterator = gci->iterator->next;
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
+	if (gci->state == 2) {
+		ldif_import_done(gci);
+		return FALSE;
+	} else {
+		e_import_status(gci->import, gci->target, _("Importing ..."), ftell(gci->file) * 100 / gci->size);
+		return TRUE;
 	}
-	
-	return;
 }
 
 static void
-primary_selection_changed_cb (ESourceSelector *selector, gpointer data)
+primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target)
 {
-	LDIFImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	gci->primary = g_object_ref (e_source_selector_peek_primary_selection (selector));
+	g_datalist_set_data_full(&target->data, "ldif-source",
+				 g_object_ref(e_source_selector_peek_primary_selection(selector)),
+				 g_object_unref);
 }
 
-static void
-create_control_fn (EvolutionImporter *importer, Bonobo_Control *control, void *closure)
+static GtkWidget *
+ldif_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	LDIFImporter *gci = closure;
 	GtkWidget *vbox, *selector;
 	ESource *primary;
 	ESourceList *source_list;	
-	
-	vbox = gtk_vbox_new (FALSE, FALSE);
-	
+
 	/* FIXME Better error handling */
 	if (!e_book_get_addressbooks (&source_list, NULL))
-		return;		
+		return NULL;
 
+	vbox = gtk_vbox_new (FALSE, FALSE);
+	
 	selector = e_source_selector_new (source_list);
 	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
-	
-	/* FIXME What if no sources? */
-	primary = e_source_list_peek_source_any (source_list);
+
+	primary = g_datalist_get_data(&target->data, "ldif-source");
+	if (primary == NULL) {
+		primary = e_source_list_peek_source_any (source_list);
+		g_object_ref(primary);
+		g_datalist_set_data_full(&target->data, "ldif-source", primary, g_object_unref);
+	}
 	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
-	if (!gci->primary)
-		gci->primary = g_object_ref (primary);
 	g_object_unref (source_list);
-		
-	g_signal_connect (G_OBJECT (selector), "primary_selection_changed",
-			  G_CALLBACK (primary_selection_changed_cb), gci);
+
+	g_signal_connect (selector, "primary_selection_changed", G_CALLBACK (primary_selection_changed_cb), target);
 
 	gtk_widget_show_all (vbox);
-	
-	*control = BONOBO_OBJREF (bonobo_control_new (vbox));
+
+	return vbox;
 }
 
 static char *supported_extensions[2] = {
@@ -565,20 +535,28 @@ static char *supported_extensions[2] = {
 };
 
 static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
+ldif_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	char *ext;
 	int i;
+	EImportTargetURI *s;
 
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
+	if (target->type != E_IMPORT_TARGET_URI)
+		return FALSE;
+
+	s = (EImportTargetURI *)target;
+	if (s->uri_src == NULL)
+		return TRUE;
+
+	if (!strncmp(s->uri_src, "file:///", 8))
+		return FALSE;
+
+	ext = strrchr(s->uri_src, '.');
+	if (ext == NULL)
 		return FALSE;
-	}
 
 	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
+		if (g_ascii_strcasecmp(supported_extensions[i], ext) == 0)
 			return TRUE;
 	}
 
@@ -586,70 +564,92 @@ support_format_fn (EvolutionImporter *importer,
 }
 
 static void
-importer_destroy_cb (gpointer data,
-		     GObject *where_object_was)
+free_dn_hash(void *k, void *v, void *d)
 {
-	LDIFImporter *gci = data;
+	g_free(k);
+}
 
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	
-	if (gci->book)
-		g_object_unref (gci->book);
+static void
+ldif_import_done(LDIFImporter *gci)
+{
+	if (gci->idle_id)
+		g_source_remove(gci->idle_id);
+
+	g_object_unref(gci->book);
+	g_slist_foreach(gci->contacts, (GFunc) g_object_unref, NULL);
+	g_slist_foreach(gci->list_contacts, (GFunc) g_object_unref, NULL);
+	g_slist_free(gci->contacts);
+	g_slist_free(gci->list_contacts);
+	g_hash_table_foreach(gci->dn_contact_hash, free_dn_hash, NULL);
+	g_hash_table_destroy(gci->dn_contact_hash);
 
-	g_list_foreach (gci->contactlist, (GFunc) g_object_unref, NULL);
-	g_list_free (gci->contactlist);
+	e_import_complete(gci->import, gci->target);
+	g_object_unref(gci->import);
 
 	g_free (gci);
 }
 
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
+static void
+ldif_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	LDIFImporter *gci;
+	EBook *book;
+	FILE *file;
+	EImportTargetURI *s = (EImportTargetURI *)target;
 
-	gci = (LDIFImporter *) closure;
-	gci->contactlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
+	book = e_book_new(g_datalist_get_data(&target->data, "ldif-source"), NULL);
+	if (book == NULL) {
+		g_message(G_STRLOC ":Couldn't create EBook.");
+		e_import_complete(ei, target);
+		return;
+	}
 
-	/* Load the book and the cards */
-	gci->book = e_book_new (gci->primary, NULL);
-	if (!gci->book) {
-		g_message (G_STRLOC ":Couldn't create EBook.");
-		return FALSE;
+	file = fopen(s->uri_src, "r");
+	if (file == NULL) {
+		g_message(G_STRLOC ":Can't open .ldif file");
+		e_import_complete(ei, target);
+		g_object_unref(book);
+		return;
 	}
-	e_book_open (gci->book, TRUE, NULL);
-	gci->contactlist = create_contacts_from_ldif (filename);
-	gci->ready = TRUE;
 
-	return TRUE;
+	gci = g_malloc0(sizeof(*gci));
+	g_datalist_set_data(&target->data, "ldif-data", gci);
+	gci->import = g_object_ref(ei);
+	gci->target = target;
+	gci->book = book;
+	gci->file = file;
+	gci->size = fseek(file, 0, SEEK_END);
+	fseek(file, 0, SEEK_SET);
+	gci->dn_contact_hash = g_hash_table_new(g_str_hash, g_str_equal);
+
+	e_book_open(gci->book, TRUE, NULL);
+
+	gci->idle_id = g_idle_add(ldif_import_contacts, gci);
 }
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    const char *component_id,
-	    void *closure)
+
+static void
+ldif_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	EvolutionImporter *importer;
-	LDIFImporter *gci;
+	LDIFImporter *gci = g_datalist_get_data(&target->data, "ldif-data");
 
-	if (!strcmp (component_id, COMPONENT_IID)) {
-		gci = g_new0 (LDIFImporter, 1);
-		importer = evolution_importer_new (create_control_fn, support_format_fn, 
-						   load_file_fn, process_item_fn, NULL, gci);
-	
-		g_object_weak_ref (G_OBJECT (importer),
-				   importer_destroy_cb, gci);
-	
-		return BONOBO_OBJECT (importer);
-	}
-	else {
-		g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id);
-		return NULL;
-	}
+	if (gci)
+		gci->state = 2;
 }
 
-BONOBO_ACTIVATION_SHLIB_FACTORY (COMPONENT_FACTORY_IID, "Evolution LDIF importer Factory", factory_fn, NULL)
+static EImportImporter ldif_importer = {
+	E_IMPORT_TARGET_URI,
+	0,
+	ldif_supported,
+	ldif_getwidget,
+	ldif_import,
+	ldif_cancel,
+};
+
+EImportImporter *
+evolution_ldif_importer_peek(void)
+{
+	ldif_importer.name = _("LDAP Data Interchange Format (.ldif)");
+	ldif_importer.description = _("Evolution LDIF importer");
+
+	return &ldif_importer;
+}
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index 8a141466eb..c53d687d26 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -19,7 +19,7 @@
  *
  * Authors: Chris Toshok <toshok@ximian.com>
  *          JP Rosevear <jpr@ximian.com>
- *
+ * 	    Michael Zucchi <notzed@ximian.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -29,37 +29,38 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtknotebook.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-shlib-factory.h>
-#include <bonobo/bonobo-control.h>
+#include <glib/gi18n.h>
 
 #include <libebook/e-book.h>
 #include <libedataserverui/e-source-selector.h>
 
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
 #include <util/eab-book-util.h>
 #include <libebook/e-destination.h>
 
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:" BASE_VERSION
-#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_Importer:" BASE_VERSION
+#include "e-util/e-import.h"
+
+#include "evolution-addressbook-importers.h"
 
 typedef struct {
+	EImport *import;
+	EImportTarget *target;
+
+	guint idle_id;
+
+	int state;		/* 0 - importing, 1 - cancelled/complete */
+	int total;
+	int count;
+
 	ESource *primary;
 	
 	GList *contactlist;
 	GList *iterator;
 	EBook *book;
-	gboolean ready;
 } VCardImporter;
 
+static void vcard_import_done(VCardImporter *gci);
+
 static void
 add_to_notes (EContact *contact, EContactField field)
 {
@@ -84,38 +85,12 @@ add_to_notes (EContact *contact, EContactField field)
 	g_free (new_text);
 }
 
-/* EvolutionImporter methods */
 static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
+vcard_import_contact(VCardImporter *gci, EContact *contact)
 {
-	VCardImporter *gci = (VCardImporter *) closure;
-	EContact *contact;
 	EContactPhoto *photo;
 	GList *attrs, *attr;
 
-	if (gci->iterator == NULL)
-		gci->iterator = gci->contactlist;
-	
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-	
-	contact = gci->iterator->data;
-
 	/* Apple's addressbook.app exports PHOTO's without a TYPE
 	   param, so let's figure out the format here if there's a
 	   PHOTO attribute missing a TYPE param.
@@ -247,25 +222,34 @@ process_item_fn (EvolutionImporter *importer,
 
 	/* FIXME Error checking */
 	e_book_add_contact (gci->book, contact, NULL);
-	
-	gci->iterator = gci->iterator->next;
-	
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
 }
 
-static char *supported_extensions[3] = {
-	".vcf",
-	".gcrd",
-	NULL
-};
+static gboolean
+vcard_import_contacts(void *data)
+{
+	VCardImporter *gci = data;
+	int count = 0;
+	GList *iterator = gci->iterator;
+
+	if (gci->state == 0) {
+		while (count < 50 && iterator) {
+			vcard_import_contact(gci, iterator->data);
+			count++;
+			iterator = iterator->next;
+		}
+		gci->count += count;
+		gci->iterator = iterator;
+		if (iterator == NULL)
+			gci->state = 1;
+	}
+	if (gci->state == 1) {
+		vcard_import_done(gci);
+		return FALSE;
+	} else {
+		e_import_status(gci->import, gci->target, _("Importing ..."), gci->count * 100 / gci->total);
+		return TRUE;
+	}
+}
 
 #define BOM (gunichar2)0xFEFF
 #define ANTIBOM (gunichar2)0xFFFE
@@ -321,7 +305,6 @@ utf16_to_utf8 (gunichar2 *utf16)
 	return g_utf16_to_utf8 (utf16, -1, NULL, NULL, NULL);
 }
 
-
 enum _VCardEncoding {
 	VCARD_ENCODING_NONE,
 	VCARD_ENCODING_UTF8,
@@ -331,7 +314,6 @@ enum _VCardEncoding {
 
 typedef enum _VCardEncoding VCardEncoding;
 
-
 /* Actually check the contents of this file */
 static VCardEncoding
 guess_vcard_encoding (const char *filename)
@@ -384,129 +366,123 @@ guess_vcard_encoding (const char *filename)
 	return encoding;
 }
 
-static gboolean 
-check_file_is_vcard (const char *filename)
-{
-	return guess_vcard_encoding (filename) != VCARD_ENCODING_NONE;
-}
-
 static void
-primary_selection_changed_cb (ESourceSelector *selector, gpointer data)
+primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target)
 {
-	VCardImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	gci->primary = g_object_ref (e_source_selector_peek_primary_selection (selector));
+	g_datalist_set_data_full(&target->data, "vcard-source",
+				 g_object_ref(e_source_selector_peek_primary_selection(selector)),
+				 g_object_unref);
 }
 
-static void
-create_control_fn (EvolutionImporter *importer, Bonobo_Control *control, void *closure)
+static GtkWidget *
+vcard_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	VCardImporter *gci = closure;
 	GtkWidget *vbox, *selector;
 	ESource *primary;
 	ESourceList *source_list;	
-	
-	vbox = gtk_vbox_new (FALSE, FALSE);
-	
+
 	/* FIXME Better error handling */
 	if (!e_book_get_addressbooks (&source_list, NULL))
-		return;		
+		return NULL;
+
+	vbox = gtk_vbox_new (FALSE, FALSE);
 
 	selector = e_source_selector_new (source_list);
 	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
 	
-	/* FIXME What if no sources? */
-	primary = e_source_list_peek_source_any (source_list);
+	primary = g_datalist_get_data(&target->data, "vcard-source");
+	if (primary == NULL) {
+		primary = e_source_list_peek_source_any (source_list);
+		g_object_ref(primary);
+		g_datalist_set_data_full(&target->data, "vcard-source", primary, g_object_unref);
+	}
 	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
-	if (!gci->primary)
-		gci->primary = g_object_ref (primary);
 	g_object_unref (source_list);
-		
-	g_signal_connect (G_OBJECT (selector), "primary_selection_changed",
-			  G_CALLBACK (primary_selection_changed_cb), gci);
+
+	g_signal_connect (selector, "primary_selection_changed", G_CALLBACK (primary_selection_changed_cb), target);
 
 	gtk_widget_show_all (vbox);
-	
-	*control = BONOBO_OBJREF (bonobo_control_new (vbox));
+
+	return vbox;
 }
 
 static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
+vcard_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	char *ext;
-	int i;
+	EImportTargetURI *s;
 
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return check_file_is_vcard (filename);
-	}
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (g_ascii_strcasecmp (supported_extensions[i], ext) == 0) {
-			return check_file_is_vcard (filename);
-		}
-	}
+	if (target->type != E_IMPORT_TARGET_URI)
+		return FALSE;
+
+	s = (EImportTargetURI *)target;
+	if (s->uri_src == NULL)
+		return TRUE;
 
-	return FALSE;
+	if (!strncmp(s->uri_src, "file:///", 8))
+		return FALSE;
+
+	/* FIXME: need to parse the url properly */
+	return guess_vcard_encoding(s->uri_src+7) != VCARD_ENCODING_NONE;
 }
 
 static void
-importer_destroy_cb (gpointer data,
-		     GObject *where_object_was)
+vcard_import_done(VCardImporter *gci)
 {
-	VCardImporter *gci = data;
-
-	if (gci->primary)
-		g_object_unref (gci->primary);
-	
-	if (gci->book)
-		g_object_unref (gci->book);
+	if (gci->idle_id)
+		g_source_remove(gci->idle_id);
 
+	g_object_unref (gci->book);
 	g_list_foreach (gci->contactlist, (GFunc) g_object_unref, NULL);
 	g_list_free (gci->contactlist);
 
+	e_import_complete(gci->import, gci->target);
+	g_object_unref(gci->import);
 	g_free (gci);
 }
 
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      void *closure)
+static void
+vcard_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	VCardImporter *gci;
 	char *contents;
 	VCardEncoding encoding;
+	EBook *book;
+	EImportTargetURI *s = (EImportTargetURI *)target;
 
-	encoding = guess_vcard_encoding (filename);
+	/* FIXME: get filename properly */
+	encoding = guess_vcard_encoding(s->uri_src+7);
 	if (encoding == VCARD_ENCODING_NONE) {
-		return FALSE;
+		/* this check is superfluous, we've already checked otherwise we can't get here ... */
+		e_import_complete(ei, target);
+		return;
 	}
 
-	gci = (VCardImporter *) closure;
-	gci->contactlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	
-	/* Load the book */
-	gci->book = e_book_new (gci->primary, NULL);
-	if (!gci->book) {
-		g_message (G_STRLOC ":Couldn't create EBook.");
-		return FALSE;
+	book = e_book_new(g_datalist_get_data(&target->data, "vcard-source"), NULL);
+	if (book == NULL) {
+		g_message(G_STRLOC ":Couldn't create EBook.");
+		e_import_complete(ei, target);
+		return;
 	}
-	e_book_open (gci->book, TRUE, NULL);
 
-	/* Load the file and the contacts */
-	if (!g_file_get_contents (filename, &contents, NULL, NULL)) {
+	if (!g_file_get_contents (s->uri_src+7, &contents, NULL, NULL)) {
 		g_message (G_STRLOC ":Couldn't read file.");
-		return FALSE;
+		e_import_complete(ei, target);
+		g_object_unref(book);
+		return;
 	}
 
+	gci = g_malloc0(sizeof(*gci));
+	g_datalist_set_data(&target->data, "vcard-data", gci);
+	gci->import = g_object_ref(ei);
+	gci->target = target;
+	gci->book = book;
+
+	e_book_open (gci->book, TRUE, NULL);
+
 	if (encoding == VCARD_ENCODING_UTF16) {
 		gchar *tmp;
+
 		gunichar2 *contents_utf16 = (gunichar2*)contents;
 		tmp = utf16_to_utf8 (contents_utf16);
 		g_free (contents);
@@ -520,33 +496,38 @@ load_file_fn (EvolutionImporter *importer,
 
 	gci->contactlist = eab_contact_list_from_string (contents);
 	g_free (contents);
+	gci->iterator = gci->contactlist;
+	gci->total = g_list_length(gci->contactlist);
 
-	gci->ready = TRUE;
-
-	return TRUE;
+	if (gci->iterator)
+		gci->idle_id = g_idle_add(vcard_import_contacts, gci);
+	else
+		vcard_import_done(gci);
 }
 					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    const char *component_id,
-	    void *closure)
+static void
+vcard_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	EvolutionImporter *importer;
-	VCardImporter *gci;
+	VCardImporter *gci = g_datalist_get_data(&target->data, "vcard-data");
 
-	if (!strcmp (component_id, COMPONENT_IID)) {
-		gci = g_new0 (VCardImporter, 1);
-		importer = evolution_importer_new (create_control_fn, support_format_fn, 
-						   load_file_fn, process_item_fn, NULL, gci);
-	
-		g_object_weak_ref (G_OBJECT (importer),
-				   importer_destroy_cb, gci);
-		return BONOBO_OBJECT (importer);
-	}
-	else {
-		g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id);
-		return NULL;
-	}
+	if (gci)
+		gci->state = 1;
 }
 
-BONOBO_ACTIVATION_SHLIB_FACTORY (COMPONENT_FACTORY_IID, "Evolution VCard Importer Factory", factory_fn, NULL)
+static EImportImporter vcard_importer = {
+	E_IMPORT_TARGET_URI,
+	0,
+	vcard_supported,
+	vcard_getwidget,
+	vcard_import,
+	vcard_cancel,
+};
+
+EImportImporter *
+evolution_vcard_importer_peek(void)
+{
+	vcard_importer.name = _("VCard (.vcf, .gcrd)");
+	vcard_importer.description = _("Evolution VCard Importer");
+
+	return &vcard_importer;
+}