Fix some warnings, Allow the importers to import into any folder. Update

Fix some warnings,
Allow the importers to import into any folder.
Update all importers for this change.
Don't emit the create_folder callback if the folder to be created already exists.
This should fix the libibex crash when importing.

svn path=/trunk/; revision=8912

1 files changed, 4 insertions, 2 deletions

diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 9b3bc3490f..34598227a1 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -162,6 +162,7 @@ evolution_importer_client_support_format (EvolutionImporterClient *client,
  * evolution_importer_client_load_file:
  * @client: The EvolutionImporterClient.
  * @filename: The file to load.
+ * @folderpath: The full path to the folder, or NULL for Inbox.
  *
  * Loads and initialises the importer.
  *
@@ -169,7 +170,8 @@ evolution_importer_client_support_format (EvolutionImporterClient *client,
  */
 gboolean
 evolution_importer_client_load_file (EvolutionImporterClient *client,
-				     const char *filename)
+				     const char *filename,
+				     const char *folderpath)
 {
 	GNOME_Evolution_Importer corba_importer;
 	gboolean result;
@@ -182,7 +184,7 @@ evolution_importer_client_load_file (EvolutionImporterClient *client,
 	CORBA_exception_init (&ev);
 	corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 	result = GNOME_Evolution_Importer_loadFile (corba_importer,
-						    filename, &ev);
+						    filename, folderpath, &ev);
 	CORBA_exception_free (&ev);
 
 	return result;