diff options
author | JP Rosevear <jpr@ximian.com> | 2004-02-05 05:08:31 +0800 |
---|---|---|
committer | JP Rosevear <jpr@src.gnome.org> | 2004-02-05 05:08:31 +0800 |
commit | 7a316616d6857334adcca14ae0cd8029128cb672 (patch) | |
tree | 20d7685213dbf4b8579d90e9e6296e24830a7c0b /shell/importer/evolution-importer.h | |
parent | 8360a36e2d24298cdbc5ad7d13c81b8b76f2a3e0 (diff) | |
download | gsoc2013-evolution-7a316616d6857334adcca14ae0cd8029128cb672.tar gsoc2013-evolution-7a316616d6857334adcca14ae0cd8029128cb672.tar.gz gsoc2013-evolution-7a316616d6857334adcca14ae0cd8029128cb672.tar.bz2 gsoc2013-evolution-7a316616d6857334adcca14ae0cd8029128cb672.tar.lz gsoc2013-evolution-7a316616d6857334adcca14ae0cd8029128cb672.tar.xz gsoc2013-evolution-7a316616d6857334adcca14ae0cd8029128cb672.tar.zst gsoc2013-evolution-7a316616d6857334adcca14ae0cd8029128cb672.zip |
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
Diffstat (limited to 'shell/importer/evolution-importer.h')
-rw-r--r-- | shell/importer/evolution-importer.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index d2fd94be0f..5fc5edc34d 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -42,13 +42,15 @@ typedef struct _EvolutionImporter EvolutionImporter; typedef struct _EvolutionImporterPrivate EvolutionImporterPrivate; typedef struct _EvolutionImporterClass EvolutionImporterClass; +typedef void (* EvolutionImporterCreateControlFn) (EvolutionImporter *importer, + Bonobo_Control *control, + void *closure); + typedef gboolean (* EvolutionImporterSupportFormatFn) (EvolutionImporter *importer, const char *filename, void *closure); 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, @@ -83,11 +85,13 @@ struct _EvolutionImporterClass { GType evolution_importer_get_type (void); -EvolutionImporter *evolution_importer_new (EvolutionImporterSupportFormatFn support_format_fn, - EvolutionImporterLoadFileFn load_file_fn, - EvolutionImporterProcessItemFn process_item_fn, - EvolutionImporterGetErrorFn get_error_fn, - void *closure); +EvolutionImporter *evolution_importer_new (EvolutionImporterCreateControlFn create_control_fn, + EvolutionImporterSupportFormatFn support_format_fn, + EvolutionImporterLoadFileFn load_file_fn, + EvolutionImporterProcessItemFn process_item_fn, + EvolutionImporterGetErrorFn get_error_fn, + void *closure); + #ifdef __cplusplus } |