Rename EShellImporter to EImportAssistant and move it to widgets.

5 files changed, 6 insertions, 973 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index edc143ee31..c1e4b11a75 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -74,8 +74,6 @@ libeshell_la_SOURCES =				\
 	e-shell-window-private.c		\
 	e-shell-window-private.h		\
 	$(eshellinclude_HEADERS)		\
-	e-shell-importer.c			\
-	e-shell-importer.h			\
 	e-shell-migrate.c			\
 	e-shell-migrate.h			\
 	e-shell-window-actions.c		\
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
deleted file mode 100644
index bcc9d4f27d..0000000000
--- a/shell/e-shell-importer.c
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- * e-shell-importer.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include "e-shell-importer.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <glib/gi18n.h>
-#include <glade/glade.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "e-util/e-error.h"
-#include "e-util/e-icon-factory.h"
-#include "e-util/e-import.h"
-#include "e-util/e-util-private.h"
-
-#define E_SHELL_IMPORTER_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_SHELL_IMPORTER, EShellImporterPrivate))
-
-typedef struct _ImportFilePage ImportFilePage;
-typedef struct _ImportDestinationPage ImportDestinationPage;
-typedef struct _ImportTypePage ImportTypePage;
-typedef struct _ImportSelectionPage ImportSelectionPage;
-
-struct _ImportFilePage {
-	GtkWidget *vbox;
-	GtkWidget *filename;
-	GtkWidget *filetype;
-
-	EImportTargetURI *target;
-	EImportImporter *importer;
-};
-
-struct _ImportDestinationPage {
-	GtkWidget *vbox;
-
-	GtkWidget *control;
-};
-
-struct _ImportTypePage {
-	GtkWidget *vbox;
-	GtkWidget *intelligent;
-	GtkWidget *file;
-};
-
-struct _ImportSelectionPage {
-	GtkWidget *vbox;
-
-	GSList *importers;
-	GSList *current;
-	EImportTargetHome *target;
-};
-
-struct _EShellImporterPrivate {
-	ImportFilePage file_page;
-	ImportDestinationPage destination_page;
-	ImportTypePage type_page;
-	ImportSelectionPage selection_page;
-
-	EImport *import;
-
-	/* Used for importing phase of operation */
-	EImportTarget *import_target;
-	EImportImporter *import_importer;
-	GtkWidget *import_dialog;
-	GtkWidget *import_label;
-	GtkWidget *import_progress;
-};
-
-enum {
-	FINISHED,
-	LAST_SIGNAL
-};
-
-static gpointer parent_class;
-static guint signals[LAST_SIGNAL];
-
-/* Importing functions */
-
-static void
-shell_importer_emit_finished (EShellImporter *shell_importer)
-{
-	g_signal_emit (shell_importer, signals[FINISHED], 0);
-}
-
-static void
-filename_changed (GtkWidget *widget,
-                  GtkAssistant *assistant)
-{
-	EShellImporterPrivate *priv;
-	ImportFilePage *page;
-	const gchar *filename;
-	gint fileok;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
-	page = &priv->file_page;
-
-	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
-
-	fileok = filename && filename[0] && g_file_test (filename, G_FILE_TEST_IS_REGULAR);
-	if (fileok) {
-		GtkTreeIter iter;
-		GtkTreeModel *model;
-		gboolean valid;
-		GSList *l;
-		EImportImporter *first = NULL;
-		gint i=0, firstitem=0;
-
-		g_free (page->target->uri_src);
-		page->target->uri_src = g_filename_to_uri (filename, NULL, NULL);
-
-		l = e_import_get_importers (
-			priv->import, (EImportTarget *) page->target);
-		model = gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype));
-		valid = gtk_tree_model_get_iter_first (model, &iter);
-		while (valid) {
-			gpointer eii = NULL;
-
-			gtk_tree_model_get (model, &iter, 2, &eii, -1);
-
-			if (g_slist_find (l, eii) != NULL) {
-				if (first == NULL) {
-					firstitem = i;
-					first = eii;
-				}
-				gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, TRUE, -1);
-				fileok = TRUE;
-			} else {
-				if (page->importer == eii)
-					page->importer = NULL;
-				gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, FALSE, -1);
-			}
-			i++;
-			valid = gtk_tree_model_iter_next (model, &iter);
-		}
-		g_slist_free (l);
-
-		if (page->importer == NULL && first) {
-			page->importer = first;
-			gtk_combo_box_set_active (GTK_COMBO_BOX (page->filetype), firstitem);
-		}
-		fileok = first != NULL;
-	} else {
-		GtkTreeIter iter;
-		GtkTreeModel *model;
-		gboolean valid;
-
-		model = gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype));
-		for (valid = gtk_tree_model_get_iter_first (model, &iter);
-		     valid;
-		     valid = gtk_tree_model_iter_next (model, &iter)) {
-			gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, FALSE, -1);
-		}
-	}
-
-	gtk_assistant_set_page_complete (assistant, page->vbox, fileok);
-}
-
-static void
-filetype_changed_cb (GtkWidget *combobox,
-                     GtkAssistant *assistant)
-{
-	EShellImporterPrivate *priv;
-	GtkTreeIter iter;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
-
-	g_return_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combobox), &iter));
-
-	gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (combobox)), &iter, 2, &priv->file_page.importer, -1);
-	filename_changed (priv->file_page.filename, assistant);
-}
-
-static void
-shell_importer_file_page_init (EShellImporter *shell_importer)
-{
-	ImportFilePage *page;
-	GtkWidget *label;
-	GtkWidget *container;
-	GtkWidget *widget;
-	GtkCellRenderer *cell;
-	GtkListStore *store;
-	const gchar *text;
-	gint row = 0;
-
-	page = &shell_importer->priv->file_page;
-
-	widget = gtk_vbox_new (FALSE, 6);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
-	page->vbox = widget;
-	gtk_widget_show (widget);
-
-	container = widget;
-
-	text = _("Choose the file that you want to import into Evolution, "
-		 "and select what type of file it is from the list.");
-
-	widget = gtk_label_new (text);
-	gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-	gtk_widget_show (widget);
-
-	widget = gtk_table_new (2, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (widget), 2);
-	gtk_table_set_col_spacings (GTK_TABLE (widget), 10);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 8);
-	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
-	gtk_widget_show (widget);
-
-	container = widget;
-
-	widget = gtk_label_new_with_mnemonic (_("F_ilename:"));
-	gtk_misc_set_alignment (GTK_MISC (widget), 1, 0.5);
-	gtk_table_attach (
-		GTK_TABLE (container), widget,
-		0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (widget);
-
-	label = widget;
-
-	widget = gtk_file_chooser_button_new (
-		_("Select a file"), GTK_FILE_CHOOSER_ACTION_OPEN);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
-	gtk_table_attach (
-		GTK_TABLE (container), widget, 1, 2,
-		row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	page->filename = widget;
-	gtk_widget_show (widget);
-
-	g_signal_connect (
-		widget, "selection-changed",
-		G_CALLBACK (filename_changed), shell_importer);
-
-	row++;
-
-	widget = gtk_label_new_with_mnemonic (_("File _type:"));
-	gtk_misc_set_alignment (GTK_MISC (widget), 1, 0.5);
-	gtk_table_attach (
-		GTK_TABLE (container), widget,
-		0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (widget);
-
-	label = widget;
-
-	store = gtk_list_store_new (
-		3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER);
-	widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
-	gtk_table_attach (
-		GTK_TABLE (container), widget,
-		1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	page->filetype = widget;
-	gtk_widget_show (widget);
-	g_object_unref (store);
-
-	cell = gtk_cell_renderer_text_new ();
-	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), cell, TRUE);
-	gtk_cell_layout_set_attributes (
-		GTK_CELL_LAYOUT (widget), cell,
-		"text", 0, "sensitive", 1, NULL);
-}
-
-static void
-shell_importer_destination_page_init (EShellImporter *shell_importer)
-{
-	ImportDestinationPage *page;
-	GtkWidget *container;
-	GtkWidget *widget;
-	const gchar *text;
-
-	page = &shell_importer->priv->destination_page;
-
-	widget = gtk_vbox_new (FALSE, 6);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
-	page->vbox = widget;
-	gtk_widget_show (widget);
-
-	container = widget;
-
-	text = _("Choose the destination for this import");
-
-	widget = gtk_label_new (text);
-	gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-	gtk_widget_show (widget);
-}
-
-static void
-shell_importer_type_page_init (EShellImporter *shell_importer)
-{
-	ImportTypePage *page;
-	GtkWidget *container;
-	GtkWidget *widget;
-	const gchar *text;
-
-	page = &shell_importer->priv->type_page;
-
-	widget = gtk_vbox_new (FALSE, 6);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
-	page->vbox = widget;
-	gtk_widget_show (widget);
-
-	container = widget;
-
-	text = _("Choose the type of importer to run:");
-
-	widget = gtk_label_new (text);
-	gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-	gtk_widget_show (widget);
-
-	widget = gtk_radio_button_new_with_mnemonic (
-		NULL, _("Import data and settings from _older programs"));
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-	page->intelligent = widget;
-	gtk_widget_show (widget);
-
-	widget = gtk_radio_button_new_with_mnemonic_from_widget (
-		GTK_RADIO_BUTTON (page->intelligent),
-		_("Import a _single file"));
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-	page->file = widget;
-	gtk_widget_show (widget);
-}
-
-static void
-shell_importer_selection_page_init (EShellImporter *shell_importer)
-{
-	ImportSelectionPage *page;
-	GtkWidget *container;
-	GtkWidget *widget;
-	const gchar *text;
-
-	page = &shell_importer->priv->selection_page;
-
-	widget = gtk_vbox_new (FALSE, 6);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
-	page->vbox = widget;
-	gtk_widget_show (widget);
-
-	container = widget;
-
-	text = _("Please select the information "
-		 "that you would like to import:");
-
-	widget = gtk_label_new (text);
-	gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-	gtk_widget_show (widget);
-
-	widget = gtk_hseparator_new ();
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-	gtk_widget_show (widget);
-}
-
-static void
-prepare_intelligent_page (GtkAssistant *assistant)
-{
-	EShellImporterPrivate *priv;
-	GSList *l;
-	GtkWidget *table;
-	gint row;
-	ImportSelectionPage *page;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
-	page = &priv->selection_page;
-
-	if (page->target != NULL) {
-		gtk_assistant_set_page_complete (assistant, page->vbox, FALSE);
-		return;
-	}
-
-	page->target = e_import_target_new_home (priv->import);
-
-	if (page->importers)
-		g_slist_free (page->importers);
-	l = page->importers =
-		e_import_get_importers (
-			priv->import, (EImportTarget *) page->target);
-
-	if (l == NULL) {
-		GtkWidget *widget;
-		const gchar *text;
-
-		text = _("Evolution checked for settings to import from "
-			 "the following\napplications: Pine, Netscape, Elm, "
-			 "iCalendar. No importable\nsettings found. If you "
-			 "would like to\ntry again, please click the "
-			 "\"Back\" button.\n");
-
-		widget = gtk_label_new (text);
-		gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-		gtk_box_pack_start (
-			GTK_BOX (page->vbox), widget, FALSE, TRUE, 0);
-		gtk_widget_show (widget);
-
-		gtk_assistant_set_page_complete (assistant, page->vbox, FALSE);
-
-		return;
-	}
-
-	table = gtk_table_new (g_slist_length (l), 2, FALSE);
-	row = 0;
-	for (;l;l=l->next) {
-		EImportImporter *eii = l->data;
-		gchar *str;
-		GtkWidget *w, *label;
-
-		w = e_import_get_widget (
-			priv->import, (EImportTarget *) page->target, eii);
-
-		str = g_strdup_printf (_("From %s:"), eii->name);
-		label = gtk_label_new (str);
-		gtk_widget_show (label);
-		g_free (str);
-
-		gtk_misc_set_alignment ((GtkMisc *)label, 0, .5);
-
-		gtk_table_attach ((GtkTable *)table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
-		if (w)
-			gtk_table_attach ((GtkTable *)table, w, 1, 2, row, row+1, GTK_FILL, 0, 3, 0);
-		row++;
-	}
-
-	gtk_widget_show (table);
-	gtk_box_pack_start (GTK_BOX (page->vbox), table, FALSE, FALSE, 0);
-
-	gtk_assistant_set_page_complete (assistant, page->vbox, TRUE);
-}
-
-static void
-import_status (EImport *import,
-               const gchar *what,
-               gint percent,
-               gpointer user_data)
-{
-	EShellImporter *shell_importer = user_data;
-	GtkProgressBar *progress_bar;
-
-	progress_bar = GTK_PROGRESS_BAR (
-		shell_importer->priv->import_progress);
-	gtk_progress_bar_set_fraction (progress_bar, percent / 100.0);
-	gtk_progress_bar_set_text (progress_bar, what);
-}
-
-static void
-import_dialog_response (GtkDialog *dialog,
-                        guint button,
-                        EShellImporter *shell_importer)
-{
-	if (button == GTK_RESPONSE_CANCEL)
-		e_import_cancel (
-			shell_importer->priv->import,
-			shell_importer->priv->import_target,
-			shell_importer->priv->import_importer);
-}
-
-static void
-import_done (EImport *ei,
-             gpointer user_data)
-{
-	EShellImporter *shell_importer = user_data;
-
-	shell_importer_emit_finished (shell_importer);
-}
-
-static void
-import_intelligent_done (EImport *ei,
-                         gpointer user_data)
-{
-	EShellImporter *shell_importer = user_data;
-
-	if (shell_importer->priv->selection_page.current
-	    && (shell_importer->priv->selection_page.current = shell_importer->priv->selection_page.current->next)) {
-		import_status (ei, "", 0, shell_importer);
-		shell_importer->priv->import_importer = shell_importer->priv->selection_page.current->data;
-		e_import_import (shell_importer->priv->import, (EImportTarget *)shell_importer->priv->selection_page.target, shell_importer->priv->import_importer, import_status, import_intelligent_done, shell_importer);
-	} else
-		import_done (ei, shell_importer);
-}
-
-static void
-prepare_file_page (GtkAssistant *assistant)
-{
-	EShellImporterPrivate *priv;
-	GSList *importers, *imp;
-	GtkListStore *store;
-	ImportFilePage *page;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
-	page = &priv->file_page;
-
-	if (page->target != NULL) {
-		filename_changed (priv->file_page.filename, assistant);
-		return;
-	}
-
-	page->target = e_import_target_new_uri (priv->import, NULL, NULL);
-	importers = e_import_get_importers (priv->import, (EImportTarget *)page->target);
-
-	store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype)));
-	gtk_list_store_clear (store);
-
-	for (imp = importers; imp; imp = imp->next) {
-		GtkTreeIter iter;
-		EImportImporter *eii = imp->data;
-
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (
-			store, &iter,
-			0, eii->name,
-			1, TRUE,
-			2, eii,
-			-1);
-	}
-
-	g_slist_free (importers);
-
-	gtk_combo_box_set_active (GTK_COMBO_BOX (page->filetype), 0);
-
-	filename_changed (priv->file_page.filename, assistant);
-
-	g_signal_connect (
-		page->filetype, "changed",
-		G_CALLBACK (filetype_changed_cb), assistant);
-}
-
-static gboolean
-prepare_destination_page (GtkAssistant *assistant)
-{
-	EShellImporterPrivate *priv;
-	ImportDestinationPage *page;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
-	page = &priv->destination_page;
-
-	if (page->control)
-		gtk_container_remove ((GtkContainer *)page->vbox, page->control);
-
-	page->control = e_import_get_widget (
-		priv->import, (EImportTarget *)
-		priv->file_page.target, priv->file_page.importer);
-	if (page->control == NULL) {
-		/* Coding error, not needed for translators */
-		page->control = gtk_label_new ("** PLUGIN ERROR ** No settings for importer");
-		gtk_widget_show (page->control);
-	}
-
-	gtk_box_pack_start (
-		GTK_BOX (priv->destination_page.vbox),
-		page->control, TRUE, TRUE, 0);
-	gtk_assistant_set_page_complete (assistant, page->vbox, TRUE);
-
-	return FALSE;
-}
-
-enum {
-	PAGE_START,
-	PAGE_INTELI_OR_DIRECT,
-	PAGE_INTELI_SOURCE,
-	PAGE_FILE_CHOOSE,
-	PAGE_FILE_DEST,
-	PAGE_FINISH
-};
-
-static gint
-forward_cb (gint current_page,
-            EShellImporter *shell_importer)
-{
-	GtkToggleButton *toggle_button;
-
-	toggle_button = GTK_TOGGLE_BUTTON (
-		shell_importer->priv->type_page.intelligent);
-
-	switch (current_page) {
-		case PAGE_INTELI_OR_DIRECT:
-			if (gtk_toggle_button_get_active (toggle_button))
-				return PAGE_INTELI_SOURCE;
-			else
-				return PAGE_FILE_CHOOSE;
-		case PAGE_INTELI_SOURCE:
-			return PAGE_FINISH;
-	}
-
-	return current_page + 1;
-}
-
-static void
-shell_importer_dispose (GObject *object)
-{
-	EShellImporterPrivate *priv;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (object);
-
-	if (priv->file_page.target != NULL) {
-		e_import_target_free (
-			priv->import, (EImportTarget *)
-			priv->file_page.target);
-		priv->file_page.target = NULL;
-	}
-
-	if (priv->selection_page.target != NULL) {
-		e_import_target_free (
-			priv->import, (EImportTarget *)
-			priv->selection_page.target);
-		priv->selection_page.target = NULL;
-	}
-
-	if (priv->import != NULL) {
-		g_object_unref (priv->import);
-		priv->import = NULL;
-	}
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-shell_importer_finalize (GObject *object)
-{
-	EShellImporterPrivate *priv;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (object);
-
-	g_slist_free (priv->selection_page.importers);
-
-	/* Chain up to parent's finalize() method. */
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static gboolean
-shell_importer_key_press_event (GtkWidget *widget,
-                                GdkEventKey *event)
-{
-	GtkWidgetClass *widget_class;
-
-	if (event->keyval == GDK_Escape) {
-		g_signal_emit_by_name (widget, "cancel");
-		return TRUE;
-	}
-
-	/* Chain up to parent's key_press_event () method. */
-	widget_class = GTK_WIDGET_CLASS (parent_class);
-	return widget_class->key_press_event (widget, event);
-}
-
-static void
-shell_importer_prepare (GtkAssistant *assistant,
-                        GtkWidget *page)
-{
-	EShellImporterPrivate *priv;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
-
-	if (page == priv->selection_page.vbox)
-		prepare_intelligent_page (assistant);
-	else if (page == priv->file_page.vbox)
-		prepare_file_page (assistant);
-	else if (page == priv->destination_page.vbox)
-		prepare_destination_page (assistant);
-}
-
-static void
-shell_importer_apply (GtkAssistant *assistant)
-{
-	EShellImporterPrivate *priv;
-	EImportCompleteFunc done = NULL;
-	gchar *msg = NULL;
-
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
-
-	if (gtk_toggle_button_get_active ((GtkToggleButton *)priv->type_page.intelligent)) {
-		priv->selection_page.current = priv->selection_page.importers;
-		if (priv->selection_page.current) {
-			priv->import_target = (EImportTarget *)priv->selection_page.target;
-			priv->import_importer = priv->selection_page.current->data;
-			done = import_intelligent_done;
-			msg = g_strdup_printf (_("Importing data."));
-		}
-	} else {
-		if (priv->file_page.importer) {
-			priv->import_importer = priv->file_page.importer;
-			priv->import_target = (EImportTarget *)priv->file_page.target;
-			done = import_done;
-			msg = g_strdup_printf (_("Importing `%s'"), priv->file_page.target->uri_src);
-		}
-	}
-
-	if (done) {
-		priv->import_dialog = e_error_new (
-			GTK_WINDOW (assistant), "shell:importing", msg, NULL);
-		g_signal_connect (priv->import_dialog, "response", G_CALLBACK(import_dialog_response), assistant);
-		priv->import_label = gtk_label_new (_("Please wait"));
-		priv->import_progress = gtk_progress_bar_new ();
-		gtk_box_pack_start (GTK_BOX(((GtkDialog *)priv->import_dialog)->vbox), priv->import_label, FALSE, FALSE, 0);
-		gtk_box_pack_start (GTK_BOX(((GtkDialog *)priv->import_dialog)->vbox), priv->import_progress, FALSE, FALSE, 0);
-		gtk_widget_show_all (priv->import_dialog);
-
-		e_import_import (priv->import, priv->import_target, priv->import_importer, import_status, import_done, assistant);
-	} else {
-		shell_importer_emit_finished (E_SHELL_IMPORTER (assistant));
-	}
-
-	g_free (msg);
-}
-
-static void
-shell_importer_class_init (EShellImporterClass *class)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkAssistantClass *assistant_class;
-
-	parent_class = g_type_class_peek_parent (class);
-	g_type_class_add_private (class, sizeof (EShellImporterPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = shell_importer_dispose;
-	object_class->finalize = shell_importer_finalize;
-
-	widget_class = GTK_WIDGET_CLASS (class);
-	widget_class->key_press_event = shell_importer_key_press_event;
-
-	assistant_class = GTK_ASSISTANT_CLASS (class);
-	assistant_class->prepare = shell_importer_prepare;
-	assistant_class->apply = shell_importer_apply;
-
-	signals[FINISHED] = g_signal_new (
-		"finished",
-		G_TYPE_FROM_CLASS (class),
-		G_SIGNAL_RUN_FIRST,
-		0, NULL, NULL,
-		g_cclosure_marshal_VOID__VOID,
-		G_TYPE_NONE, 0);
-}
-
-static void
-shell_importer_init (EShellImporter *shell_importer)
-{
-	const gchar *empty_xpm_img[] = {
-		"48 1 2 1",
-		" 	c None",
-		".	c #FFFFFF",
-		"                                                "};
-
-	GtkAssistant *assistant;
-	GtkWidget *page;
-	GdkPixbuf *icon, *spacer;
-
-	assistant = GTK_ASSISTANT (shell_importer);
-
-	shell_importer->priv = E_SHELL_IMPORTER_GET_PRIVATE (shell_importer);
-
-	shell_importer->priv->import =
-		e_import_new ("org.gnome.evolution.shell.importer");
-
-	icon = e_icon_factory_get_icon ("stock_mail-import", GTK_ICON_SIZE_DIALOG);
-	spacer = gdk_pixbuf_new_from_xpm_data (empty_xpm_img);
-
-	gtk_window_set_position (GTK_WINDOW (assistant), GTK_WIN_POS_CENTER);
-	gtk_window_set_title (GTK_WINDOW (assistant), _("Evolution Import Assistant"));
-	gtk_window_set_default_size (GTK_WINDOW (assistant), 500, 330);
-
-	/* Start page */
-	page = gtk_label_new ("");
-	gtk_label_set_line_wrap (GTK_LABEL (page), TRUE);
-	gtk_misc_set_alignment (GTK_MISC (page), 0.0, 0.5);
-	gtk_misc_set_padding (GTK_MISC (page), 12, 12);
-	gtk_label_set_text (GTK_LABEL (page), _(
-		"Welcome to the Evolution Import Assistant.\n"
-		"With this assistant you will be guided through the "
-		"process of importing external files into Evolution."));
-	gtk_widget_show (page);
-
-	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_header_image (assistant, page, icon);
-	gtk_assistant_set_page_title (assistant, page, _("Evolution Import Assistant"));
-	gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_INTRO);
-	gtk_assistant_set_page_side_image (assistant, page, spacer);
-	gtk_assistant_set_page_complete (assistant, page, TRUE);
-
-	/* Intelligent or direct import page */
-	shell_importer_type_page_init (shell_importer);
-	page = shell_importer->priv->type_page.vbox;
-
-	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_header_image (assistant, page, icon);
-	gtk_assistant_set_page_title (assistant, page, _("Importer Type"));
-	gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
-	gtk_assistant_set_page_complete (assistant, page, TRUE);
-
-	/* Intelligent importer source page */
-	shell_importer_selection_page_init (shell_importer);
-	page = shell_importer->priv->selection_page.vbox;
-
-	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_header_image (assistant, page, icon);
-	gtk_assistant_set_page_title (assistant, page, _("Select Information to Import"));
-	gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
-
-	/* File selection and file type page */
-	shell_importer_file_page_init (shell_importer);
-	page = shell_importer->priv->file_page.vbox;
-
-	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_header_image (assistant, page, icon);
-	gtk_assistant_set_page_title (assistant, page, _("Select a File"));
-	gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
-
-	/* File destination page */
-	shell_importer_destination_page_init (shell_importer);
-	page = shell_importer->priv->destination_page.vbox;
-
-	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_header_image (assistant, page, icon);
-	gtk_assistant_set_page_title (assistant, page, _("Import Location"));
-	gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
-
-	/* Finish page */
-	page = gtk_label_new ("");
-	gtk_misc_set_alignment (GTK_MISC (page), 0.5, 0.5);
-	gtk_label_set_text (
-		GTK_LABEL (page), _("Click \"Apply\" to "
-		"begin importing the file into Evolution."));
-	gtk_widget_show (page);
-
-	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_header_image (assistant, page, icon);
-	gtk_assistant_set_page_title (assistant, page, _("Import File"));
-	gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
-	gtk_assistant_set_page_side_image (assistant, page, spacer);
-	gtk_assistant_set_page_complete (assistant, page, TRUE);
-
-	gtk_assistant_set_forward_page_func (
-		assistant, (GtkAssistantPageFunc)
-		forward_cb, shell_importer, NULL);
-
-	g_object_unref (icon);
-	g_object_unref (spacer);
-
-	gtk_assistant_update_buttons_state (assistant);
-}
-
-GType
-e_shell_importer_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		static const GTypeInfo type_info = {
-			sizeof (EShellImporterClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) shell_importer_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			sizeof (EShellImporter),
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) shell_importer_init,
-			NULL   /* value_table */
-		};
-
-		type = g_type_register_static (
-			GTK_TYPE_ASSISTANT, "EShellImporter", &type_info, 0);
-	}
-
-	return type;
-}
-
-GtkWidget *
-e_shell_importer_new (GtkWindow *parent)
-{
-	return g_object_new (
-		E_TYPE_SHELL_IMPORTER,
-		"transient-for", parent, NULL);
-}
diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h
deleted file mode 100644
index 0a31d45cd1..0000000000
--- a/shell/e-shell-importer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * e-shell-importer.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_SHELL_IMPORTER_H
-#define E_SHELL_IMPORTER_H
-
-#include "e-shell-common.h"
-
-/* Standard GObject macros */
-#define E_TYPE_SHELL_IMPORTER \
-	(e_shell_importer_get_type ())
-#define E_SHELL_IMPORTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_SHELL_IMPORTER, EShellImporter))
-#define E_SHELL_IMPORTER_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_SHELL_IMPORTER, EShellImporterClass))
-#define E_IS_SHELL_IMPORTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_SHELL_IMPORTER))
-#define E_IS_SHELL_IMPORTER_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_SHELL_IMPORTER))
-#define E_SHELL_IMPORTER_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_SHELL_IMPORTER, EShellImporterClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EShellImporter EShellImporter;
-typedef struct _EShellImporterClass EShellImporterClass;
-typedef struct _EShellImporterPrivate EShellImporterPrivate;
-
-struct _EShellImporter {
-	GtkAssistant parent;
-	EShellImporterPrivate *priv;
-};
-
-struct _EShellImporterClass {
-	GtkAssistantClass parent_class;
-};
-
-GType		e_shell_importer_get_type	(void);
-GtkWidget *	e_shell_importer_new		(GtkWindow *parent);
-
-G_END_DECLS
-
-#endif /* E_SHELL_IMPORTER_H */
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 7ded180449..ce10bca488 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -28,8 +28,6 @@
 
 #include <libedataserverui/e-passwords.h>
 
-#include "e-shell-importer.h"
-
 #define EVOLUTION_COPYRIGHT \
 	"Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others"
 
@@ -838,19 +836,19 @@ static void
 action_import_cb (GtkAction *action,
                   EShellWindow *shell_window)
 {
-	GtkWidget *importer;
+	GtkWidget *assistant;
 
-	importer = e_shell_importer_new (GTK_WINDOW (shell_window));
+	assistant = e_import_assistant_new (GTK_WINDOW (shell_window));
 
 	g_signal_connect (
-		importer, "cancel",
+		assistant, "cancel",
 		G_CALLBACK (gtk_widget_destroy), NULL);
 
 	g_signal_connect (
-		importer, "finished",
+		assistant, "finished",
 		G_CALLBACK (gtk_widget_destroy), NULL);
 
-	gtk_widget_show (importer);
+	gtk_widget_show (assistant);
 }
 
 /**
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 5314a3679f..c4f2e195d2 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -31,6 +31,7 @@
 #include <e-util/e-binding.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/gconf-bridge.h>
+#include <widgets/misc/e-import-assistant.h>
 #include <widgets/misc/e-menu-tool-button.h>
 #include <widgets/misc/e-online-button.h>