From 2aa78ac24cc10be4587c7a82bea38d9170b2fb57 Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Thu, 11 Jan 2001 20:20:57 +0000 Subject: Will it work? svn path=/trunk/; revision=7405 --- shell/importer/evolution-importer-client.c | 2 +- shell/importer/evolution-importer-client.h | 2 +- shell/importer/evolution-importer.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 2ed190ce71..1687679cc4 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -266,7 +266,7 @@ evolution_importer_client_construct (EvolutionImporterClient *client, } EvolutionImporterClient * -evolution_importer_client_new (const GNOME_Evolution_Importer objref) +evolution_importer_client_new (const CORBA_Object objref) { EvolutionImporterClient *client; diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h index 464cce826f..3e81d8a9ba 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -62,7 +62,7 @@ typedef void (* EvolutionImporterClientCallback) (EvolutionImporterClient *clien GtkType evolution_importer_client_get_type (void); void evolution_importer_client_construct (EvolutionImporterClient *client, CORBA_Object corba_object); -EvolutionImporterClient *evolution_importer_client_new (const GNOME_Evolution_Importer objref); +EvolutionImporterClient *evolution_importer_client_new (const CORBA_Object objref); void evolution_importer_client_process_item (EvolutionImporterClient *client, EvolutionImporterClientCallback callback, diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index be4ca1b34d..07dd844955 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -26,7 +26,6 @@ #include -#include "GNOME_Evolution_Importer.h" #include "evolution-importer.h" #ifdef __cplusplus @@ -46,7 +45,7 @@ typedef struct _EvolutionImporterClass EvolutionImporterClass; typedef enum _EvolutionImporterResult EvolutionImporterResult; typedef void (* EvolutionImporterProcessItemFn) (EvolutionImporter *importer, - GNOME_Evolution_ImporterListener listener, + CORBA_Object listener, void *closure, CORBA_Environment *ev); typedef char *(* EvolutionImporterGetErrorFn) (EvolutionImporter *importer, -- cgit