update from ../../importers/. (main): Removed.

2003-02-05  Not Zed  <NotZed@Ximian.com>

	* importers/netscape-importer.c: update from ../../importers/.
	(main): Removed.
	(mail_importer_module_init): Setup module init fn.
	(factory_fn): api changes.
	(is_dir_empty): deprecated changes, and clean up logic.
	(importer_cb): pulse progress bar, use idle function for
	processing next item.
	(import_next): Remove link before recursing, also fix memleak, and
	api changes.
	(netscape_import_file): dont release importer.
	(*): gconf'ify

	* importers/elm-importer.c (elm_factory_fn): Track the
	evolution_intelligent_importer, so we can unref it when done.
	(*): gconf'ify.

	* importers/pine-importer.c (parse_line): use gobject stuff rather
	than gtkobject.
	(import_addressfile): close down 'properly' when finished.
	(importer_timeout_fn): Do most processing decisions here, either
	from a timeout or idle function.  This prevents us getting 1 stack
	frame per message and per folder.  Close down properly also.
	(importer_cb): Add a timeout, ignore the callback, or add an idle
	function to process the next item.
	(pine_import_file): dont release the importer if we can't load it,
	its released elsewhere, i think.
	(import_addressfile): step the progress bar as we go.
	(factory_fn): Track the evolution_intelligent_importer, so we can
	unref when done.
	(*): gconf'ify

2003-01-31  Not Zed  <NotZed@Ximian.com>

	* importers/elm-importer.c (elm_can_import): g_file_exists ->
	lstat, and g_build_filename api changes.

	* importers/pine-importer.c: moved from
	../../importers/pine-importer.c
	(factory_fn): oaf->bonobo_activation
	(mail_importer_module_init): setup factory.
	(main): Removed.
	(*): REemove bonobo config stuff.
	(factory_fn): destroy signal -> weak ref.
	(pine_destroy_cb): Fix signature for weak ref notify.
	(import_addressfile): use new glib filename stuff.
	(import_addressbook): same.
	(pine_can_import): and here.
	(import_next): and here.
	(scan_dir): and here
	(pine_create_structure): And here.
	(pine_can_import): g_file_exists -> lstat.
	(importer_cb): If there are more items, use an idle handler to
	drop back a few stack frames rather than recursing for each
	message.
	(import_next): unlink data from dir_list before recursing, and fix
	leak.

2003-01-30  Not Zed  <NotZed@Ximian.com>

	* importers/elm-importer.c (elm_destroy_cb): Change for weak ref
	setup.
	(elm_factory_fn): destroy -> weak ref.

2003-01-29  Not Zed  <NotZed@Ximian.com>

	* importers/elm-importer.c (importer_cb): Pass processItem off to
	an idle handler, so we dont blow our stacks.  Also update to use
	progress_bar_pulse().
	(import_item_idle): Get the next message here instead.
	(import_next): Fix a glist leak.  Unlink the file before we import
	it too.  And close the dialogue and clean up when we've run out of
	folders to import.

2003-01-17  Not Zed  <NotZed@Ximian.com>

	* importers/elm-importer.c (elm_create_structure): use/free elmdir
	rather than double-free maildir.

2003-01-16  Not Zed  <NotZed@Ximian.com>

	* importers/elm-importer.c: update from ../importers/elm-importer.c

svn path=/trunk/; revision=19752

1 files changed, 699 insertions, 0 deletions

diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
new file mode 100644
index 0000000000..67b6e8747c
--- /dev/null
+++ b/mail/importers/pine-importer.c
@@ -0,0 +1,699 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* pine-importer.c
+ * 
+ * Authors: 
+ *    Iain Holmes  <iain@ximian.com>
+ *
+ * Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of version 2 of the GNU General Public 
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include <libgnomeui/gnome-messagebox.h>
+#include <gtk/gtk.h>
+
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+#include <bonobo/bonobo-object.h>
+#include <bonobo/bonobo-generic-factory.h>
+#include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-context.h>
+#include <bonobo/bonobo-main.h>
+#include <bonobo/bonobo-exception.h>
+#include <bonobo/bonobo-moniker-util.h>
+
+#include <importer/evolution-intelligent-importer.h>
+#include <importer/evolution-importer-client.h>
+#include <importer/GNOME_Evolution_Importer.h>
+
+#include <ebook/e-book.h>
+#include <ebook/e-card-simple.h>
+
+#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"
+#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
+#define KEY "pine-mail-imported"
+
+/*#define SUPER_IMPORTER_DEBUG*/
+#ifdef SUPER_IMPORTER_DEBUG
+#define d(x) x
+#else
+#define d(x)
+#endif
+
+typedef struct {
+	EvolutionIntelligentImporter *ii;
+
+	GList *dir_list;
+
+	int progress_count;
+
+	GNOME_Evolution_Importer importer;
+	EvolutionImporterListener *listener;
+
+	GtkWidget *mail;
+	gboolean do_mail;
+	GtkWidget *address;
+	gboolean do_address;
+
+	EBook *book;
+
+	int timeout_id;
+	int more;
+
+	/* GUI */
+	GtkWidget *dialog;
+	GtkWidget *label;
+	GtkWidget *progressbar;
+} PineImporter;
+
+typedef struct {
+	char *parent;
+	char *foldername;
+	char *path;
+	gboolean folder;
+} PineFolder;
+
+static void import_next (PineImporter *importer);
+
+static GtkWidget *
+create_importer_gui (PineImporter *importer)
+{
+	GtkWidget *dialog;
+
+	dialog = gnome_message_box_new (_("Evolution is importing your old Pine data"), GNOME_MESSAGE_BOX_INFO, NULL);
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Importing..."));
+
+	importer->label = gtk_label_new (_("Please wait"));
+	importer->progressbar = gtk_progress_bar_new ();
+	gtk_progress_set_activity_mode (GTK_PROGRESS (importer->progressbar), TRUE);
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
+			    importer->label, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
+			    importer->progressbar, FALSE, FALSE, 0);
+	return dialog;
+}
+
+static void
+pine_store_settings (PineImporter *importer)
+{
+	GConfClient *gconf = gconf_client_get_default ();
+
+	gconf_client_set_bool (gconf, "/apps/evolution/importer/pine/mail", importer->do_mail, NULL);
+	gconf_client_set_bool (gconf, "/apps/evolution/importer/pine/address", importer->do_address, NULL);
+}
+
+static void
+pine_restore_settings (PineImporter *importer)
+{
+	GConfClient *gconf = gconf_client_get_default ();
+
+	importer->do_mail = gconf_client_get_bool (gconf, "/apps/evolution/importer/pine/mail", NULL);
+	importer->do_address = gconf_client_get_bool (gconf, "/apps/evolution/importer/pine/address", NULL);
+}
+
+/* A very basic address spliter.
+   Returns the first email address
+   denoted by <address> */
+static char *
+parse_address (const char *address)
+{
+	char *addr_dup, *result, *start, *end;
+
+	if (address == NULL) {
+		return NULL;
+	}
+
+	addr_dup = g_strdup (address);
+	start = strchr (addr_dup, '<');
+	if (start == NULL) {
+		/* Whole line is an address */
+		return addr_dup;
+	}
+
+	start += 1;
+	end = strchr (start, '>');
+	if (end == NULL) {
+		result = g_strdup (start);
+		g_free (addr_dup);
+
+		return result;
+	}
+
+	*end = 0;
+	result = strdup (start);
+	g_free (addr_dup);
+
+	return result;
+}
+
+static void
+add_card_cb (EBook *book, 
+	     EBookStatus status,
+	     const char *id,
+	     gpointer closure)
+{
+	g_object_unref (closure);
+}
+
+static void
+parse_line (EBook *book,
+	    char *line)
+{
+	char **strings;
+	ECardName *name;
+	ECard *card;
+	EList *list;
+
+	card = e_card_new ("");
+	strings = g_strsplit (line, "\t", 3);
+	if (strings[0] && strings[1] && strings[2]) {
+		name = e_card_name_from_string (strings[1]);
+		g_object_set (card,
+			      "nickname", strings[0],
+			      "full_name", strings[1],
+			      "name", name, NULL);
+		g_object_get (card,
+			      "email", &list,
+			      NULL);
+		e_list_append (list, strings[2]);
+		g_strfreev (strings);
+		e_book_add_card (book, card, add_card_cb, card);
+	}
+}
+
+static void
+import_addressfile (EBook *book,
+		    EBookStatus status,
+		    gpointer user_data)
+{
+	char *addressbook;
+	FILE *handle;
+	char line[2 * 1024];
+	int which = 0;
+	char *lastline = NULL;
+	PineImporter *importer = user_data;
+
+	addressbook = g_build_filename(g_get_home_dir(), ".addressbook", NULL);
+	handle = fopen (addressbook, "r");
+	g_free (addressbook);
+
+	if (handle == NULL) {
+		g_warning ("Cannot open .addressbook");
+		return;
+	}
+
+	while (fgets (line + which * 1024, 1024, handle)) {
+		int length;
+		char *thisline = line + which * 1024;
+
+		importer->progress_count++;
+		if ((importer->progress_count & 0xf) == 0)
+			gtk_progress_bar_pulse(GTK_PROGRESS_BAR(importer->progressbar));
+		
+		length = strlen (thisline);
+		if (thisline[length - 1] == '\n') {
+			line[--length] = 0;
+		}
+
+		if (lastline && *thisline && isspace ((int) *thisline)) {
+			char *temp;
+
+			while (*thisline && isspace ((int) *thisline)) {
+				thisline++;
+			}
+			temp = lastline;
+			lastline = g_strdup_printf ("%s%s", lastline, thisline);
+			g_free (temp);
+			continue;
+		}
+
+		if (lastline) {
+			parse_line (book, lastline);
+			g_free (lastline);
+		}
+
+		lastline = g_strdup (thisline);
+	}
+
+	if (lastline) {
+		parse_line (book, lastline);
+		g_free (lastline);
+	}
+
+	fclose (handle);
+}
+
+static void
+import_addressbook (PineImporter *importer)
+{
+	char *path, *uri;
+
+	importer->book = e_book_new ();
+	if (importer->book == NULL) {
+		g_warning ("Could not create EBook.");
+		return;
+	}
+
+	path = g_build_filename(g_get_home_dir (),
+				"evolution/local/Contacts/addressbook.db", NULL);
+	uri = g_strdup_printf ("file://%s", path);
+	g_free (path);
+
+	if (!e_book_load_uri (importer->book, uri, import_addressfile, importer)) {
+		g_warning ("Error calling load_uri");
+	}
+	g_free (uri);
+}
+
+static gboolean
+importer_timeout_fn (gpointer data)
+{
+	PineImporter *importer = (PineImporter *) data;
+	CORBA_Environment ev;
+
+	importer->timeout_id = 0;
+
+	if (importer->more) {
+		importer->progress_count++;
+		if ((importer->progress_count & 0xf) == 0)
+			gtk_progress_bar_pulse(GTK_PROGRESS_BAR(importer->progressbar));
+
+		CORBA_exception_init (&ev);
+		GNOME_Evolution_Importer_processItem (importer->importer, bonobo_object_corba_objref (BONOBO_OBJECT (importer->listener)), &ev);
+		if (ev._major != CORBA_NO_EXCEPTION)
+			g_warning ("Exception: %s", CORBA_exception_id (&ev));
+		CORBA_exception_free (&ev);
+	} else if (importer->dir_list) {
+		import_next (importer);
+	} else {
+		bonobo_object_unref (BONOBO_OBJECT (importer->ii));
+	}
+	
+	return FALSE;
+}
+
+static void
+importer_cb (EvolutionImporterListener *listener,
+	     EvolutionImporterResult result,
+	     gboolean more_items,
+	     void *data)
+{
+	PineImporter *importer = (PineImporter *) data;
+	CORBA_Object objref;
+	CORBA_Environment ev;
+
+	if (result == EVOLUTION_IMPORTER_NOT_READY ||
+	    result == EVOLUTION_IMPORTER_BUSY) {
+		importer->more = more_items;
+		importer->timeout_id = gtk_timeout_add (1000, importer_timeout_fn, data);
+		return;
+	}
+
+	if (importer->timeout_id) {
+		/* we ignore multiple calls, we can get them if for
+		example we're waiting for a folder to open, yet we
+		tried to open the next.  Uh, this shouldn't happen
+		anyway, but ... */
+		return;
+	}
+
+	importer->more = more_items;
+
+	importer->timeout_id = g_idle_add(importer_timeout_fn, importer);
+	return;
+}
+
+static gboolean
+pine_import_file (PineImporter *importer,
+		  const char *path,
+		  const char *folderpath,
+		  gboolean folder)
+{
+	CORBA_boolean result;
+	CORBA_Environment ev;
+	CORBA_Object objref;
+	char *str;
+
+	CORBA_exception_init (&ev);
+
+	str = g_strdup_printf (_("Importing %s as %s"), path, folderpath);
+	gtk_label_set_text (GTK_LABEL (importer->label), str);
+	g_free (str);
+	while (gtk_events_pending ()) {
+		gtk_main_iteration ();
+	}
+
+	result = GNOME_Evolution_Importer_loadFile (importer->importer, path,
+						    folderpath, &ev);
+	if (ev._major != CORBA_NO_EXCEPTION || result == FALSE) {
+		g_warning ("Exception here: %s\n%s, %s", CORBA_exception_id (&ev), path, folderpath);
+		CORBA_exception_free (&ev);
+		return FALSE;
+	}
+
+	importer->listener = evolution_importer_listener_new (importer_cb,
+							      importer);
+	objref = bonobo_object_corba_objref (BONOBO_OBJECT (importer->listener));
+	GNOME_Evolution_Importer_processItem (importer->importer, objref, &ev);
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_warning ("Exception: %s", CORBA_exception_id (&ev));
+		CORBA_exception_free (&ev);
+	}
+	CORBA_exception_free (&ev);
+
+	return TRUE;
+}
+
+static gboolean
+pine_can_import (EvolutionIntelligentImporter *ii,
+		 void *closure)
+{
+	PineImporter *importer = closure;
+	char *maildir, *addrfile;
+	gboolean mail;
+	gboolean md_exists = FALSE, addr_exists = FALSE;
+	struct stat st;
+	GConfClient *gconf = gconf_client_get_default();
+
+	maildir = g_build_filename(g_get_home_dir(), "mail", NULL);
+	md_exists = lstat(maildir, &st) == 0 && S_ISDIR(st.st_mode);
+	importer->do_mail = md_exists;
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->mail),
+				      importer->do_mail);
+	
+	gtk_widget_set_sensitive (importer->mail, md_exists);
+	g_free (maildir);
+
+	addrfile = g_build_filename(g_get_home_dir(), ".addressbook", NULL);
+	addr_exists = lstat(addrfile, &st) == 0 && S_ISREG(st.st_mode);
+	g_free (addrfile);
+	gtk_widget_set_sensitive (importer->address, addr_exists);
+
+	return md_exists || addr_exists;
+}
+
+static void
+import_next (PineImporter *importer)
+{
+	PineFolder *data;
+
+	if (importer->dir_list) {
+		char *folder;
+		GList *l;
+
+		l = importer->dir_list;
+		data = l->data;
+		folder = g_build_filename(data->parent, data->foldername, NULL);
+		importer->dir_list = l->next;
+		g_list_free_1(l);
+
+		pine_import_file (importer, data->path, folder, data->folder);
+		g_free (folder);
+		g_free (data->parent);
+		g_free (data->path);
+		g_free (data->foldername);
+		g_free (data);
+	}
+	
+}
+
+/* Pine uses sent-mail and saved-mail whereas Evolution uses Sent and Drafts */
+static char *
+maybe_replace_name (const char *original_name)
+{
+	if (strcmp (original_name, "sent-mail") == 0) {
+		return g_strdup ("Sent");
+	} else if (strcmp (original_name, "saved-messages") == 0) {
+		return g_strdup ("Drafts");
+	} 
+
+	return g_strdup (original_name);
+}
+
+static void
+scan_dir (PineImporter *importer,
+	  const char *dirname,
+	  const char *orig_parent)
+{
+	DIR *maildir;
+	struct stat buf;
+	struct dirent *current;
+	char *str;
+	
+	maildir = opendir (dirname);
+	if (maildir == NULL) {
+		g_warning ("Could not open %s\nopendir returned: %s",
+			   dirname, g_strerror (errno));
+		return;
+	}
+	
+	str = g_strdup_printf (_("Scanning %s"), dirname);
+	gtk_label_set_text (GTK_LABEL (importer->label), str);
+	g_free (str);
+
+	while (gtk_events_pending ()) {
+		gtk_main_iteration ();
+	}
+
+	current = readdir (maildir);
+	while (current) {
+		PineFolder *pf;
+		char *fullname, *foldername;
+		
+		/* Ignore . and .. */
+		if (current->d_name[0] == '.') {
+			if (current->d_name[1] == '\0' ||
+			    (current->d_name[1] == '.' && current->d_name[2] == '\0')) {
+				current = readdir (maildir);
+				continue;
+			}
+		}
+
+		if (*orig_parent == '/') {
+			foldername = maybe_replace_name (current->d_name);
+		} else {
+			foldername = g_strdup (current->d_name);
+		}
+			
+		fullname = g_build_filename(dirname, current->d_name, NULL);
+		if (stat (fullname, &buf) == -1) {
+			g_warning ("Could not stat %s\nstat returned: %s",
+				   fullname, g_strerror (errno));
+			current = readdir (maildir);
+			g_free (fullname);
+			continue;
+		}
+		
+		if (S_ISREG (buf.st_mode)) {
+			pf = g_new (PineFolder, 1);
+			pf->path = g_strdup (fullname);
+			pf->parent = g_strdup (orig_parent);
+			pf->foldername = g_strdup (foldername);
+			pf->folder = FALSE;
+			importer->dir_list = g_list_append (importer->dir_list, pf);
+		} else if (S_ISDIR (buf.st_mode)) {
+			char *subdir;
+
+			pf = g_new (PineFolder, 1);
+			pf->path = g_strdup (fullname);
+			pf->parent = g_strdup (orig_parent);
+			pf->foldername = g_strdup (foldername);
+			pf->folder = TRUE;
+  			importer->dir_list = g_list_append (importer->dir_list, pf);
+
+			subdir = g_build_filename (orig_parent, foldername, NULL);
+			scan_dir (importer, fullname, subdir);
+			g_free (subdir);
+		}
+		
+		g_free (fullname);
+		g_free (foldername);
+		current = readdir (maildir);
+	}
+}
+
+static void
+pine_create_structure (EvolutionIntelligentImporter *ii,
+		       void *closure)
+{
+	CORBA_Environment ev;
+	PineImporter *importer = closure;
+	char *maildir;
+	GConfClient *gconf = gconf_client_get_default ();
+	
+	bonobo_object_ref (BONOBO_OBJECT (ii));
+	pine_store_settings (importer);
+
+	/* Create a dialog */
+	if (importer->do_address == TRUE ||
+	    importer->do_mail == TRUE) {
+		importer->dialog = create_importer_gui (importer);
+		gtk_widget_show_all (importer->dialog);
+		while (gtk_events_pending ()) {
+			gtk_main_iteration ();
+		}
+	}
+
+	if (importer->do_address == TRUE) {
+		gconf_client_set_bool(gconf, "/apps/evolution/importer/pine/address-imported", TRUE, NULL);
+		import_addressbook (importer);
+	}
+
+	if (importer->do_mail == TRUE) {
+		gconf_client_set_bool(gconf, "/apps/evolution/importer/pine/mail-imported", TRUE, NULL);
+		maildir = g_build_filename(g_get_home_dir(), "mail", NULL);
+		gtk_label_set_text (GTK_LABEL (importer->label),
+				    _("Scanning directory"));
+		while (gtk_events_pending ()) {
+			gtk_main_iteration ();
+		}
+
+		scan_dir (importer, maildir, "/");
+		g_free (maildir);
+
+		/* Import them */
+		import_next (importer);
+	}
+
+	if (importer->do_mail == FALSE && importer->do_address == FALSE) {
+		/* Destroy it here if we weren't importing mail
+		   otherwise the mail importer destroys itself
+		   once the mail is imported */
+		bonobo_object_unref (BONOBO_OBJECT (ii));
+	}
+	bonobo_object_unref (BONOBO_OBJECT (ii));
+}
+
+static void
+pine_destroy_cb (PineImporter *importer, GtkObject *object)
+{
+	CORBA_Environment ev;
+
+	pine_store_settings (importer);
+
+	if (importer->dialog)
+		gtk_widget_destroy(importer->dialog);
+
+	if (importer->importer != CORBA_OBJECT_NIL) {
+		bonobo_object_release_unref (importer->importer, NULL);
+	}
+}
+
+/* Fun inity stuff */
+
+/* Fun control stuff */
+static void
+checkbox_toggle_cb (GtkToggleButton *tb,
+		    gboolean *do_item)
+{
+	*do_item = gtk_toggle_button_get_active (tb);
+}
+
+static BonoboControl *
+create_checkboxes_control (PineImporter *importer)
+{
+	GtkWidget *hbox;
+	BonoboControl *control;
+
+	hbox = gtk_hbox_new (FALSE, 2);
+
+	importer->mail = gtk_check_button_new_with_label (_("Mail"));
+	gtk_signal_connect (GTK_OBJECT (importer->mail), "toggled",
+			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),
+			    &importer->do_mail);
+
+	importer->address = gtk_check_button_new_with_label (_("Addressbook"));
+	gtk_signal_connect (GTK_OBJECT (importer->address), "toggled",
+			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),
+			    &importer->do_address);
+
+	gtk_box_pack_start (GTK_BOX (hbox), importer->mail, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), importer->address, FALSE, FALSE, 0);
+
+	gtk_widget_show_all (hbox);
+	control = bonobo_control_new (hbox);
+	return control;
+}
+
+static BonoboObject *
+factory_fn (BonoboGenericFactory *_factory,
+	    const char *iid,
+	    void *closure)
+{
+	EvolutionIntelligentImporter *importer;
+	BonoboControl *control;
+	PineImporter *pine;
+	CORBA_Environment ev;
+	char *message = N_("Evolution has found Pine mail files.\n"
+			   "Would you like to import them into Evolution?");
+
+	pine = g_new0 (PineImporter, 1);
+
+	CORBA_exception_init (&ev);
+	pine_restore_settings (pine);
+
+	pine->importer = bonobo_activation_activate_from_id (MBOX_IMPORTER_IID, 0, NULL, &ev);
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_warning ("Could not start MBox importer\n%s",
+			   CORBA_exception_id (&ev));
+		CORBA_exception_free (&ev);
+		return NULL;
+	}
+	CORBA_exception_free (&ev);
+
+	importer = evolution_intelligent_importer_new (pine_can_import,
+						       pine_create_structure,
+						       _("Pine"),
+						       _(message), pine);
+	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);
+}
+
+void
+mail_importer_module_init (void)
+{
+	BonoboGenericFactory *factory;
+	static int init = FALSE;
+
+	if (init)
+		return;
+
+	factory = bonobo_generic_factory_new (PINE_INTELLIGENT_IMPORTER_IID,
+					      factory_fn, NULL);
+	if (factory == NULL)
+		g_warning ("Could not initialise Pine Intelligent Mail Importer.");
+	init = TRUE;
+}