New listener object. Plus some oneway stuff as well.

svn path=/trunk/; revision=7729

1 files changed, 2 insertions, 10 deletions

diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index e122a7cfdd..178d20254f 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -26,6 +26,7 @@
 
 #include <bonobo/bonobo-object-client.h>
 #include <importer/evolution-importer.h>
+#include <importer/evolution-importer-listener.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,24 +41,16 @@ extern "C" {
 
 
 typedef struct _EvolutionImporterClient EvolutionImporterClient;
-typedef struct _EvolutionImporterClientPrivate EvolutionImporterClientPrivate;
 typedef struct _EvolutionImporterClientClass EvolutionImporterClientClass;
 
 struct _EvolutionImporterClient {
   BonoboObjectClient parent;
-
-  EvolutionImporterClientPrivate *private;
 };
 
 struct _EvolutionImporterClientClass {
   BonoboObjectClientClass parent_class;
 };
 
-typedef void (* EvolutionImporterClientCallback) (EvolutionImporterClient *client,
-						  EvolutionImporterResult result,
-						  gboolean more_items,
-						  void *data);
-
 GtkType evolution_importer_client_get_type (void);
 
 EvolutionImporterClient *evolution_importer_client_new (const CORBA_Object objref);
@@ -68,8 +61,7 @@ gboolean evolution_importer_client_support_format (EvolutionImporterClient *clie
 gboolean evolution_importer_client_load_file (EvolutionImporterClient *client,
 					      const char *filename);
 void evolution_importer_client_process_item (EvolutionImporterClient *client,
-					     EvolutionImporterClientCallback callback,
-					     void *closure);
+					     EvolutionImporterListener *listener);
 const char *evolution_importer_client_get_error (EvolutionImporterClient *client);
 
 #ifdef __cplusplus