aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-01-12 04:20:57 +0800
committerIain Holmes <iain@src.gnome.org>2001-01-12 04:20:57 +0800
commit2aa78ac24cc10be4587c7a82bea38d9170b2fb57 (patch)
tree56c5b0891c0454a0fc0f0bb3fe5e4bc50533981b
parent3eee053cd68a6bc18d0505cf8ebebd0a41af4ccf (diff)
downloadgsoc2013-evolution-2aa78ac24cc10be4587c7a82bea38d9170b2fb57.tar.gz
gsoc2013-evolution-2aa78ac24cc10be4587c7a82bea38d9170b2fb57.tar.zst
gsoc2013-evolution-2aa78ac24cc10be4587c7a82bea38d9170b2fb57.zip
Will it work?
svn path=/trunk/; revision=7405
-rw-r--r--shell/importer/evolution-importer-client.c2
-rw-r--r--shell/importer/evolution-importer-client.h2
-rw-r--r--shell/importer/evolution-importer.h3
3 files changed, 3 insertions, 4 deletions
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 <bonobo/bonobo-object.h>
-#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,