s/BonoboXObject/BonoboObject/ (for BONOBO_DISABLE_DEPRECATED)

	* s/BonoboXObject/BonoboObject/ (for BONOBO_DISABLE_DEPRECATED)

svn path=/trunk/; revision=19427

4 files changed, 15 insertions, 15 deletions

diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index 84bcfe3b7e..5f99384dce 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.c
@@ -30,7 +30,7 @@
 #include <gal/util/e-util.h>
 
 #include "GNOME_Evolution_Importer.h"
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 static BonoboObjectClass *parent_class = NULL;
 
@@ -219,6 +219,6 @@ evolution_importer_listener_new (EvolutionImporterListenerCallback callback,
 	return listener;
 }
 
-BONOBO_X_TYPE_FUNC_FULL (EvolutionImporterListener,
-			 GNOME_Evolution_ImporterListener,
-			 PARENT_TYPE, evolution_importer_listener);
+BONOBO_TYPE_FUNC_FULL (EvolutionImporterListener,
+		       GNOME_Evolution_ImporterListener,
+		       PARENT_TYPE, evolution_importer_listener);
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index bbdf750140..7254346fc2 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.h
@@ -24,7 +24,7 @@
 #define EVOLUTION_IMPORTER_LISTENER_H
 
 #include <glib.h>
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include <importer/GNOME_Evolution_Importer.h>
 #include "evolution-importer.h"
 
@@ -48,13 +48,13 @@ typedef void (* EvolutionImporterListenerCallback) (EvolutionImporterListener *l
 						    gboolean more_items,
 						    void *closure);
 struct _EvolutionImporterListener {
-	BonoboXObject parent;
+	BonoboObject parent;
 	
 	EvolutionImporterListenerPrivate *priv;
 };
 
 struct _EvolutionImporterListenerClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_ImporterListener__epv epv;
 };
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index 3b5603d2e1..59723bb732 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -31,7 +31,7 @@
 
 #include "GNOME_Evolution_Importer.h"
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 static BonoboObjectClass *parent_class = NULL;
 
 struct _EvolutionImporterPrivate {
@@ -223,7 +223,7 @@ evolution_importer_new (EvolutionImporterSupportFormatFn support_format_fn,
 	return importer;
 }
 
-BONOBO_X_TYPE_FUNC_FULL (EvolutionImporter,
-			 GNOME_Evolution_Importer,
-			 PARENT_TYPE,
-			 evolution_importer);
+BONOBO_TYPE_FUNC_FULL (EvolutionImporter,
+		       GNOME_Evolution_Importer,
+		       PARENT_TYPE,
+		       evolution_importer);
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index b4322d091e..9b655138ec 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -24,7 +24,7 @@
 #define EVOLUTION_IMPORTER_H
 
 #include <glib.h>
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include <importer/GNOME_Evolution_Importer.h>
 
 #ifdef __cplusplus
@@ -69,13 +69,13 @@ typedef enum {
 } EvolutionImporterResult;
 
 struct _EvolutionImporter {
-	BonoboXObject parent;
+	BonoboObject parent;
 	
 	EvolutionImporterPrivate *priv;
 };
 
 struct _EvolutionImporterClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	
 	POA_GNOME_Evolution_Importer__epv epv;
 };