diff options
Diffstat (limited to 'shell/importer')
| -rw-r--r-- | shell/importer/GNOME_Evolution_Importer.idl | 4 | ||||
| -rw-r--r-- | shell/importer/evolution-importer-client.c | 5 | ||||
| -rw-r--r-- | shell/importer/evolution-importer-client.h | 3 | ||||
| -rw-r--r-- | shell/importer/evolution-importer.c | 3 | ||||
| -rw-r--r-- | shell/importer/evolution-importer.h | 1 |
5 files changed, 12 insertions, 4 deletions
diff --git a/shell/importer/GNOME_Evolution_Importer.idl b/shell/importer/GNOME_Evolution_Importer.idl index 18ea7a65bb..775ba47377 100644 --- a/shell/importer/GNOME_Evolution_Importer.idl +++ b/shell/importer/GNOME_Evolution_Importer.idl @@ -72,6 +72,7 @@ module Evolution { * loadFile: * @filename: The filename of the file. * @folderpath: The full pathname to the folder. + * @foldertpe: The type of the folder to import to. * * Loads the file and prepares an Importer object that can * process files of this type. @@ -79,7 +80,8 @@ module Evolution { * Returns: An Importer object. */ boolean loadFile (in string filename, - in string folderpath); + in string folderpath, + in string foldertype); }; interface IntelligentImporter : Bonobo::Unknown { diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index b8be15bc08..1f6807b3c8 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -152,6 +152,7 @@ evolution_importer_client_support_format (EvolutionImporterClient *client, * @client: The EvolutionImporterClient. * @filename: The file to load. * @physical_uri: The physical URI of the folder to import data into. + * @folder_type: The type of the folder represented by @physical_uri. * * Loads and initialises the importer. * @@ -160,7 +161,8 @@ evolution_importer_client_support_format (EvolutionImporterClient *client, gboolean evolution_importer_client_load_file (EvolutionImporterClient *client, const char *filename, - const char *physical_uri) + const char *physical_uri, + const char *folder_type) { GNOME_Evolution_Importer corba_importer; gboolean result; @@ -175,6 +177,7 @@ evolution_importer_client_load_file (EvolutionImporterClient *client, result = GNOME_Evolution_Importer_loadFile (corba_importer, filename, physical_uri ? physical_uri : "", + folder_type ? folder_type : "", &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 6f105589f4..46b38e851a 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -61,7 +61,8 @@ gboolean evolution_importer_client_support_format (EvolutionImporterClient *clie const char *filename); gboolean evolution_importer_client_load_file (EvolutionImporterClient *client, const char *filename, - const char *physical_uri); + const char *physical_uri, + const char *folder_type); 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 c76e727c3c..cd419b4ca9 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -72,6 +72,7 @@ static CORBA_boolean impl_GNOME_Evolution_Importer_loadFile (PortableServer_Servant servant, const CORBA_char *filename, const CORBA_char *physical_uri, + const CORBA_char *folder_type, CORBA_Environment *ev) { EvolutionImporter *importer; @@ -81,7 +82,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, physical_uri, priv->closure); + return (priv->load_file_fn) (importer, filename, physical_uri, folder_type, priv->closure); else return FALSE; } diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index da7fe94daa..d2fd94be0f 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -48,6 +48,7 @@ typedef gboolean (* EvolutionImporterSupportFormatFn) (EvolutionImporter *import typedef gboolean (* EvolutionImporterLoadFileFn) (EvolutionImporter *importer, const char *filename, const char *physical_uri, + const char *folder_type, void *closure); typedef void (* EvolutionImporterProcessItemFn) (EvolutionImporter *importer, CORBA_Object listener, |