Rename EShellImporter to EImportAssistant and move it to widgets.

11 files changed, 160 insertions, 179 deletions

diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index 037ad06b52..176eba6de9 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -130,6 +130,7 @@ GTKDOC_LIBS=								\
 	$(top_builddir)/widgets/misc/.libs/e-activity-proxy.o		\
 	$(top_builddir)/widgets/misc/.libs/e-gui-utils.o		\
 	$(top_builddir)/widgets/misc/.libs/e-hinted-entry.o		\
+	$(top_builddir)/widgets/misc/.libs/e-import-assistant.o		\
 	$(top_builddir)/widgets/misc/.libs/e-menu-tool-button.o		\
 	$(top_builddir)/widgets/misc/.libs/e-online-button.o		\
 	$(top_builddir)/widgets/misc/.libs/e-popup-menu.o		\
diff --git a/doc/reference/shell/eshell-docs.sgml b/doc/reference/shell/eshell-docs.sgml
index c01c399cb3..44a2735238 100644
--- a/doc/reference/shell/eshell-docs.sgml
+++ b/doc/reference/shell/eshell-docs.sgml
@@ -22,7 +22,6 @@ url="http://mbarnes.fedorapeople.org/docs/eshell/">http://mbarnes.fedorapeople.o
     <xi:include href="xml/e-shell-taskbar.xml"/>
     <xi:include href="xml/e-shell-settings.xml"/>
     <xi:include href="xml/e-shell-switcher.xml"/>
-    <xi:include href="xml/e-shell-importer.xml"/>
   </chapter>
 
   <chapter>
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index d4bacb539d..82a7ca5a06 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -287,24 +287,6 @@ E_SHELL_WINDOW_ACTION_GROUP
 </SECTION>
 
 <SECTION>
-<FILE>e-shell-importer</FILE>
-<TITLE>EShellImporter</TITLE>
-EShellImporter
-e_shell_importer_new
-<SUBSECTION Standard>
-E_SHELL_IMPORTER
-E_IS_SHELL_IMPORTER
-E_TYPE_SHELL_IMPORTER
-E_SHELL_IMPORTER_CLASS
-E_IS_SHELL_IMPORTER_CLASS
-E_SHELL_IMPORTER_GET_CLASS
-EShellImporterClass
-e_shell_importer_get_type
-<SUBSECTION Private>
-EShellImporterPrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-account-utils</FILE>
 <TITLE>Mail Account Functions</TITLE>
 e_get_account_list
diff --git a/doc/reference/shell/tmpl/e-shell-importer.sgml b/doc/reference/shell/tmpl/e-shell-importer.sgml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/reference/shell/tmpl/e-shell-importer.sgml
+++ /dev/null
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.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>
 
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index dd94186b41..ef3eba03d2 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -63,6 +63,7 @@ widgetsinclude_HEADERS =			\
 	e-hinted-entry.h			\
 	e-hsv-utils.h				\
 	e-image-chooser.h			\
+	e-import-assistant.h			\
 	e-map.h					\
 	e-menu-tool-button.h			\
 	e-online-button.h			\
@@ -128,6 +129,7 @@ libemiscwidgets_la_SOURCES =			\
 	e-hinted-entry.c			\
 	e-hsv-utils.c				\
 	e-image-chooser.c			\
+	e-import-assistant.c			\
 	e-map.c					\
 	e-menu-tool-button.c			\
 	e-online-button.c			\
diff --git a/shell/e-shell-importer.c b/widgets/misc/e-import-assistant.c
index bcc9d4f27d..4db3d55353 100644
--- a/shell/e-shell-importer.c
+++ b/widgets/misc/e-import-assistant.c
@@ -1,5 +1,5 @@
 /*
- * e-shell-importer.c
+ * e-import-assistant.c
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@
  *
  */
 
-#include "e-shell-importer.h"
+#include "e-import-assistant.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -35,9 +35,9 @@
 #include "e-util/e-import.h"
 #include "e-util/e-util-private.h"
 
-#define E_SHELL_IMPORTER_GET_PRIVATE(obj) \
+#define E_IMPORT_ASSISTANT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_SHELL_IMPORTER, EShellImporterPrivate))
+	((obj), E_TYPE_IMPORT_ASSISTANT, EImportAssistantPrivate))
 
 typedef struct _ImportFilePage ImportFilePage;
 typedef struct _ImportDestinationPage ImportDestinationPage;
@@ -73,7 +73,7 @@ struct _ImportSelectionPage {
 	EImportTargetHome *target;
 };
 
-struct _EShellImporterPrivate {
+struct _EImportAssistantPrivate {
 	ImportFilePage file_page;
 	ImportDestinationPage destination_page;
 	ImportTypePage type_page;
@@ -100,21 +100,21 @@ static guint signals[LAST_SIGNAL];
 /* Importing functions */
 
 static void
-shell_importer_emit_finished (EShellImporter *shell_importer)
+import_assistant_emit_finished (EImportAssistant *import_assistant)
 {
-	g_signal_emit (shell_importer, signals[FINISHED], 0);
+	g_signal_emit (import_assistant, signals[FINISHED], 0);
 }
 
 static void
 filename_changed (GtkWidget *widget,
                   GtkAssistant *assistant)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 	ImportFilePage *page;
 	const gchar *filename;
 	gint fileok;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
 	page = &priv->file_page;
 
 	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
@@ -182,10 +182,10 @@ static void
 filetype_changed_cb (GtkWidget *combobox,
                      GtkAssistant *assistant)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 	GtkTreeIter iter;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
 
 	g_return_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combobox), &iter));
 
@@ -194,7 +194,7 @@ filetype_changed_cb (GtkWidget *combobox,
 }
 
 static void
-shell_importer_file_page_init (EShellImporter *shell_importer)
+import_assistant_file_page_init (EImportAssistant *import_assistant)
 {
 	ImportFilePage *page;
 	GtkWidget *label;
@@ -205,7 +205,7 @@ shell_importer_file_page_init (EShellImporter *shell_importer)
 	const gchar *text;
 	gint row = 0;
 
-	page = &shell_importer->priv->file_page;
+	page = &import_assistant->priv->file_page;
 
 	widget = gtk_vbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
@@ -251,7 +251,7 @@ shell_importer_file_page_init (EShellImporter *shell_importer)
 
 	g_signal_connect (
 		widget, "selection-changed",
-		G_CALLBACK (filename_changed), shell_importer);
+		G_CALLBACK (filename_changed), import_assistant);
 
 	row++;
 
@@ -283,14 +283,14 @@ shell_importer_file_page_init (EShellImporter *shell_importer)
 }
 
 static void
-shell_importer_destination_page_init (EShellImporter *shell_importer)
+import_assistant_destination_page_init (EImportAssistant *import_assistant)
 {
 	ImportDestinationPage *page;
 	GtkWidget *container;
 	GtkWidget *widget;
 	const gchar *text;
 
-	page = &shell_importer->priv->destination_page;
+	page = &import_assistant->priv->destination_page;
 
 	widget = gtk_vbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
@@ -308,14 +308,14 @@ shell_importer_destination_page_init (EShellImporter *shell_importer)
 }
 
 static void
-shell_importer_type_page_init (EShellImporter *shell_importer)
+import_assistant_type_page_init (EImportAssistant *import_assistant)
 {
 	ImportTypePage *page;
 	GtkWidget *container;
 	GtkWidget *widget;
 	const gchar *text;
 
-	page = &shell_importer->priv->type_page;
+	page = &import_assistant->priv->type_page;
 
 	widget = gtk_vbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
@@ -346,14 +346,14 @@ shell_importer_type_page_init (EShellImporter *shell_importer)
 }
 
 static void
-shell_importer_selection_page_init (EShellImporter *shell_importer)
+import_assistant_selection_page_init (EImportAssistant *import_assistant)
 {
 	ImportSelectionPage *page;
 	GtkWidget *container;
 	GtkWidget *widget;
 	const gchar *text;
 
-	page = &shell_importer->priv->selection_page;
+	page = &import_assistant->priv->selection_page;
 
 	widget = gtk_vbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
@@ -378,13 +378,13 @@ shell_importer_selection_page_init (EShellImporter *shell_importer)
 static void
 prepare_intelligent_page (GtkAssistant *assistant)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 	GSList *l;
 	GtkWidget *table;
 	gint row;
 	ImportSelectionPage *page;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
 	page = &priv->selection_page;
 
 	if (page->target != NULL) {
@@ -456,11 +456,11 @@ import_status (EImport *import,
                gint percent,
                gpointer user_data)
 {
-	EShellImporter *shell_importer = user_data;
+	EImportAssistant *import_assistant = user_data;
 	GtkProgressBar *progress_bar;
 
 	progress_bar = GTK_PROGRESS_BAR (
-		shell_importer->priv->import_progress);
+		import_assistant->priv->import_progress);
 	gtk_progress_bar_set_fraction (progress_bar, percent / 100.0);
 	gtk_progress_bar_set_text (progress_bar, what);
 }
@@ -468,48 +468,48 @@ import_status (EImport *import,
 static void
 import_dialog_response (GtkDialog *dialog,
                         guint button,
-                        EShellImporter *shell_importer)
+                        EImportAssistant *import_assistant)
 {
 	if (button == GTK_RESPONSE_CANCEL)
 		e_import_cancel (
-			shell_importer->priv->import,
-			shell_importer->priv->import_target,
-			shell_importer->priv->import_importer);
+			import_assistant->priv->import,
+			import_assistant->priv->import_target,
+			import_assistant->priv->import_importer);
 }
 
 static void
 import_done (EImport *ei,
              gpointer user_data)
 {
-	EShellImporter *shell_importer = user_data;
+	EImportAssistant *import_assistant = user_data;
 
-	shell_importer_emit_finished (shell_importer);
+	import_assistant_emit_finished (import_assistant);
 }
 
 static void
 import_intelligent_done (EImport *ei,
                          gpointer user_data)
 {
-	EShellImporter *shell_importer = user_data;
+	EImportAssistant *import_assistant = 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);
+	if (import_assistant->priv->selection_page.current
+	    && (import_assistant->priv->selection_page.current = import_assistant->priv->selection_page.current->next)) {
+		import_status (ei, "", 0, import_assistant);
+		import_assistant->priv->import_importer = import_assistant->priv->selection_page.current->data;
+		e_import_import (import_assistant->priv->import, (EImportTarget *)import_assistant->priv->selection_page.target, import_assistant->priv->import_importer, import_status, import_intelligent_done, import_assistant);
 	} else
-		import_done (ei, shell_importer);
+		import_done (ei, import_assistant);
 }
 
 static void
 prepare_file_page (GtkAssistant *assistant)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 	GSList *importers, *imp;
 	GtkListStore *store;
 	ImportFilePage *page;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
 	page = &priv->file_page;
 
 	if (page->target != NULL) {
@@ -550,10 +550,10 @@ prepare_file_page (GtkAssistant *assistant)
 static gboolean
 prepare_destination_page (GtkAssistant *assistant)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 	ImportDestinationPage *page;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
 	page = &priv->destination_page;
 
 	if (page->control)
@@ -587,12 +587,12 @@ enum {
 
 static gint
 forward_cb (gint current_page,
-            EShellImporter *shell_importer)
+            EImportAssistant *import_assistant)
 {
 	GtkToggleButton *toggle_button;
 
 	toggle_button = GTK_TOGGLE_BUTTON (
-		shell_importer->priv->type_page.intelligent);
+		import_assistant->priv->type_page.intelligent);
 
 	switch (current_page) {
 		case PAGE_INTELI_OR_DIRECT:
@@ -608,11 +608,11 @@ forward_cb (gint current_page,
 }
 
 static void
-shell_importer_dispose (GObject *object)
+import_assistant_dispose (GObject *object)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (object);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (object);
 
 	if (priv->file_page.target != NULL) {
 		e_import_target_free (
@@ -638,11 +638,11 @@ shell_importer_dispose (GObject *object)
 }
 
 static void
-shell_importer_finalize (GObject *object)
+import_assistant_finalize (GObject *object)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (object);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (object);
 
 	g_slist_free (priv->selection_page.importers);
 
@@ -651,7 +651,7 @@ shell_importer_finalize (GObject *object)
 }
 
 static gboolean
-shell_importer_key_press_event (GtkWidget *widget,
+import_assistant_key_press_event (GtkWidget *widget,
                                 GdkEventKey *event)
 {
 	GtkWidgetClass *widget_class;
@@ -667,12 +667,12 @@ shell_importer_key_press_event (GtkWidget *widget,
 }
 
 static void
-shell_importer_prepare (GtkAssistant *assistant,
+import_assistant_prepare (GtkAssistant *assistant,
                         GtkWidget *page)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
 
 	if (page == priv->selection_page.vbox)
 		prepare_intelligent_page (assistant);
@@ -683,13 +683,13 @@ shell_importer_prepare (GtkAssistant *assistant,
 }
 
 static void
-shell_importer_apply (GtkAssistant *assistant)
+import_assistant_apply (GtkAssistant *assistant)
 {
-	EShellImporterPrivate *priv;
+	EImportAssistantPrivate *priv;
 	EImportCompleteFunc done = NULL;
 	gchar *msg = NULL;
 
-	priv = E_SHELL_IMPORTER_GET_PRIVATE (assistant);
+	priv = E_IMPORT_ASSISTANT_GET_PRIVATE (assistant);
 
 	if (gtk_toggle_button_get_active ((GtkToggleButton *)priv->type_page.intelligent)) {
 		priv->selection_page.current = priv->selection_page.importers;
@@ -720,32 +720,32 @@ shell_importer_apply (GtkAssistant *assistant)
 
 		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));
+		import_assistant_emit_finished (E_IMPORT_ASSISTANT (assistant));
 	}
 
 	g_free (msg);
 }
 
 static void
-shell_importer_class_init (EShellImporterClass *class)
+import_assistant_class_init (EImportAssistantClass *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));
+	g_type_class_add_private (class, sizeof (EImportAssistantPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = shell_importer_dispose;
-	object_class->finalize = shell_importer_finalize;
+	object_class->dispose = import_assistant_dispose;
+	object_class->finalize = import_assistant_finalize;
 
 	widget_class = GTK_WIDGET_CLASS (class);
-	widget_class->key_press_event = shell_importer_key_press_event;
+	widget_class->key_press_event = import_assistant_key_press_event;
 
 	assistant_class = GTK_ASSISTANT_CLASS (class);
-	assistant_class->prepare = shell_importer_prepare;
-	assistant_class->apply = shell_importer_apply;
+	assistant_class->prepare = import_assistant_prepare;
+	assistant_class->apply = import_assistant_apply;
 
 	signals[FINISHED] = g_signal_new (
 		"finished",
@@ -757,7 +757,7 @@ shell_importer_class_init (EShellImporterClass *class)
 }
 
 static void
-shell_importer_init (EShellImporter *shell_importer)
+import_assistant_init (EImportAssistant *import_assistant)
 {
 	const gchar *empty_xpm_img[] = {
 		"48 1 2 1",
@@ -769,11 +769,11 @@ shell_importer_init (EShellImporter *shell_importer)
 	GtkWidget *page;
 	GdkPixbuf *icon, *spacer;
 
-	assistant = GTK_ASSISTANT (shell_importer);
+	assistant = GTK_ASSISTANT (import_assistant);
 
-	shell_importer->priv = E_SHELL_IMPORTER_GET_PRIVATE (shell_importer);
+	import_assistant->priv = E_IMPORT_ASSISTANT_GET_PRIVATE (import_assistant);
 
-	shell_importer->priv->import =
+	import_assistant->priv->import =
 		e_import_new ("org.gnome.evolution.shell.importer");
 
 	icon = e_icon_factory_get_icon ("stock_mail-import", GTK_ICON_SIZE_DIALOG);
@@ -802,8 +802,8 @@ shell_importer_init (EShellImporter *shell_importer)
 	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;
+	import_assistant_type_page_init (import_assistant);
+	page = import_assistant->priv->type_page.vbox;
 
 	gtk_assistant_append_page (assistant, page);
 	gtk_assistant_set_page_header_image (assistant, page, icon);
@@ -812,8 +812,8 @@ shell_importer_init (EShellImporter *shell_importer)
 	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;
+	import_assistant_selection_page_init (import_assistant);
+	page = import_assistant->priv->selection_page.vbox;
 
 	gtk_assistant_append_page (assistant, page);
 	gtk_assistant_set_page_header_image (assistant, page, icon);
@@ -821,8 +821,8 @@ shell_importer_init (EShellImporter *shell_importer)
 	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;
+	import_assistant_file_page_init (import_assistant);
+	page = import_assistant->priv->file_page.vbox;
 
 	gtk_assistant_append_page (assistant, page);
 	gtk_assistant_set_page_header_image (assistant, page, icon);
@@ -830,8 +830,8 @@ shell_importer_init (EShellImporter *shell_importer)
 	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;
+	import_assistant_destination_page_init (import_assistant);
+	page = import_assistant->priv->destination_page.vbox;
 
 	gtk_assistant_append_page (assistant, page);
 	gtk_assistant_set_page_header_image (assistant, page, icon);
@@ -855,7 +855,7 @@ shell_importer_init (EShellImporter *shell_importer)
 
 	gtk_assistant_set_forward_page_func (
 		assistant, (GtkAssistantPageFunc)
-		forward_cb, shell_importer, NULL);
+		forward_cb, import_assistant, NULL);
 
 	g_object_unref (icon);
 	g_object_unref (spacer);
@@ -864,35 +864,35 @@ shell_importer_init (EShellImporter *shell_importer)
 }
 
 GType
-e_shell_importer_get_type (void)
+e_import_assistant_get_type (void)
 {
 	static GType type = 0;
 
 	if (G_UNLIKELY (type == 0)) {
 		static const GTypeInfo type_info = {
-			sizeof (EShellImporterClass),
+			sizeof (EImportAssistantClass),
 			(GBaseInitFunc) NULL,
 			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) shell_importer_class_init,
+			(GClassInitFunc) import_assistant_class_init,
 			(GClassFinalizeFunc) NULL,
 			NULL,  /* class_data */
-			sizeof (EShellImporter),
+			sizeof (EImportAssistant),
 			0,     /* n_preallocs */
-			(GInstanceInitFunc) shell_importer_init,
+			(GInstanceInitFunc) import_assistant_init,
 			NULL   /* value_table */
 		};
 
 		type = g_type_register_static (
-			GTK_TYPE_ASSISTANT, "EShellImporter", &type_info, 0);
+			GTK_TYPE_ASSISTANT, "EImportAssistant", &type_info, 0);
 	}
 
 	return type;
 }
 
 GtkWidget *
-e_shell_importer_new (GtkWindow *parent)
+e_import_assistant_new (GtkWindow *parent)
 {
 	return g_object_new (
-		E_TYPE_SHELL_IMPORTER,
+		E_TYPE_IMPORT_ASSISTANT,
 		"transient-for", parent, NULL);
 }
diff --git a/widgets/misc/e-import-assistant.h b/widgets/misc/e-import-assistant.h
new file mode 100644
index 0000000000..1e8f444ec6
--- /dev/null
+++ b/widgets/misc/e-import-assistant.h
@@ -0,0 +1,66 @@
+/*
+ * e-import-assistant.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_IMPORT_ASSISTANT_H
+#define E_IMPORT_ASSISTANT_H
+
+#include <gtk/gtk.h>
+
+/* Standard GObject macros */
+#define E_TYPE_IMPORT_ASSISTANT \
+	(e_import_assistant_get_type ())
+#define E_IMPORT_ASSISTANT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_IMPORT_ASSISTANT, EImportAssistant))
+#define E_IMPORT_ASSISTANT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_IMPORT_ASSISTANT, EImportAssistantClass))
+#define E_IS_IMPORT_ASSISTANT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_IMPORT_ASSISTANT))
+#define E_IS_IMPORT_ASSISTANT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_IMPORT_ASSISTANT))
+#define E_IMPORT_ASSISTANT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_IMPORT_ASSISTANT, EImportAssistantClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EImportAssistant EImportAssistant;
+typedef struct _EImportAssistantClass EImportAssistantClass;
+typedef struct _EImportAssistantPrivate EImportAssistantPrivate;
+
+struct _EImportAssistant {
+	GtkAssistant parent;
+	EImportAssistantPrivate *priv;
+};
+
+struct _EImportAssistantClass {
+	GtkAssistantClass parent_class;
+};
+
+GType		e_import_assistant_get_type	(void);
+GtkWidget *	e_import_assistant_new		(GtkWindow *parent);
+
+G_END_DECLS
+
+#endif /* E_IMPORT_ASSISTANT_H */