From 7a316616d6857334adcca14ae0cd8029128cb672 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@ximian.com>
Date: Wed, 4 Feb 2004 21:08:31 +0000
Subject: add extra page

2004-02-04  JP Rosevear <jpr@ximian.com>

	* importer/import.glade: add extra page

	* importer/evolution-importer.h: update protos

	* importer/evolution-importer.c: hold the createControl function
	(impl_GNOME_Evolution_Importer_createControl): implement
	(impl_GNOME_Evolution_Importer_loadFile): remove dead args

	* importer/evolution-importer-client.h: update/add protos

	* importer/evolution-importer-client.c
	(evolution_importer_client_create_control): wrapper
	(evolution_importer_client_load_file): we don't take physical_uri
	and folder_type as args any more

	* importer/GNOME_Evolution_Importer.idl: add createControl method
	and remove extraneous loadFile args

	* e-shell-window-commands.c (command_import): uncomment

	* e-shell-importer.h: update proto

	* e-shell-importer.c: remove DEPRECATED hack and tidy includes
	(get_iid_for_filetype): use query define
	(start_import): we don't take a file name and client directly now
	(create_plugin_menu): user query define
	(importer_dest_page_new): create vbox
	(import_druid_finish): we no longer do folder selection here
	(next_file_page): create the client here
	(prepare_dest_page): show the importer control
	(next_dest_page): skip to the finish
	(back_finish_page): back to the destination page
	(e_shell_importer_start_import): set up the destination page

	* Makefile.am: build import files again

svn path=/trunk/; revision=24619
---
 shell/e-shell-window-commands.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'shell/e-shell-window-commands.c')

diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 9640d86a0d..2154fc387b 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -27,6 +27,7 @@
 #include "e-shell-window-commands.h"
 
 #include "e-shell-about-box.h"
+#include "e-shell-importer.h"
 #include "e-shell-window.h"
 
 #include "evolution-shell-component-utils.h"
@@ -75,9 +76,7 @@ command_import (BonoboUIComponent *uih,
 		EShellWindow *window,
 		const char *path)
 {
-	g_warning ("Import not implemented!");
-
-	/* e_shell_importer_start_import ();  FIXME TODO */
+	e_shell_importer_start_import (window);
 }
 
 static void
-- 
cgit