*** empty log message ***

svn path=/trunk/; revision=20378

4 files changed, 7 insertions, 8 deletions

diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 99e096a833..b8be15bc08 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -151,7 +151,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.
+ * @physical_uri: The physical URI of the folder to import data into.
  *
  * Loads and initialises the importer.
  *
@@ -160,7 +160,7 @@ evolution_importer_client_support_format (EvolutionImporterClient *client,
 gboolean
 evolution_importer_client_load_file (EvolutionImporterClient *client,
 				     const char *filename,
-				     const char *folderpath)
+				     const char *physical_uri)
 {
 	GNOME_Evolution_Importer corba_importer;
 	gboolean result;
@@ -174,7 +174,7 @@ evolution_importer_client_load_file (EvolutionImporterClient *client,
 	corba_importer = client->objref;
 	result = GNOME_Evolution_Importer_loadFile (corba_importer,
 						    filename,
-						    folderpath ? folderpath : "",
+						    physical_uri ? physical_uri : "",
 						    &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Oh there *WAS* an exception.\nIt was %s",
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 13d144e076..6f105589f4 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -61,7 +61,7 @@ gboolean evolution_importer_client_support_format (EvolutionImporterClient *clie
 						   const char *filename);
 gboolean evolution_importer_client_load_file (EvolutionImporterClient *client,
 					      const char *filename,
-					      const char *folderpath);
+					      const char *physical_uri);
 void evolution_importer_client_process_item (EvolutionImporterClient *client,
 					     EvolutionImporterListener *listener);
 const char *evolution_importer_client_get_error (EvolutionImporterClient *client);
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index 59723bb732..c76e727c3c 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -71,7 +71,7 @@ impl_GNOME_Evolution_Importer_supportFormat (PortableServer_Servant servant,
 static CORBA_boolean
 impl_GNOME_Evolution_Importer_loadFile (PortableServer_Servant servant,
 					const CORBA_char *filename,
-					const CORBA_char *folderpath,
+					const CORBA_char *physical_uri,
 					CORBA_Environment *ev)
 {
 	EvolutionImporter *importer;
@@ -81,8 +81,7 @@ impl_GNOME_Evolution_Importer_loadFile (PortableServer_Servant servant,
 	priv = importer->priv;
 
 	if (priv->load_file_fn != NULL)
-		return (priv->load_file_fn) (importer, filename, 
-					     folderpath, priv->closure);
+		return (priv->load_file_fn) (importer, filename, physical_uri, priv->closure);
 	else
 		return FALSE;
 }
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index 9b655138ec..da7fe94daa 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -47,7 +47,7 @@ typedef gboolean (* EvolutionImporterSupportFormatFn) (EvolutionImporter *import
 						       void *closure);
 typedef gboolean (* EvolutionImporterLoadFileFn) (EvolutionImporter *importer,
 						  const char *filename,
-						  const char *folderpath,
+						  const char *physical_uri,
 						  void *closure);
 typedef void (* EvolutionImporterProcessItemFn) (EvolutionImporter *importer,
 						 CORBA_Object listener,