4 files changed, 15 insertions, 15 deletions
diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c
index 88c497ac14..694ade9882 100644
--- a/calendar/gui/calendar-offline-handler.c
+++ b/calendar/gui/calendar-offline-handler.c
@@ -34,8 +34,8 @@
 #include <cal-client/cal-client.h>
 #include "calendar-offline-handler.h"
 
-#define PARENT_TYPE bonobo_x_object_get_type ()
-static BonoboXObjectClass *parent_class = NULL;
+#define PARENT_TYPE bonobo_object_get_type ()
+static BonoboObjectClass *parent_class = NULL;
 
 struct _CalendarOfflineHandlerPrivate {
 	CalClient *client;
@@ -288,4 +288,4 @@ calendar_offline_handler_new (void)
 	return new;
 }
 
-BONOBO_X_TYPE_FUNC_FULL (CalendarOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, calendar_offline_handler);
+BONOBO_TYPE_FUNC_FULL (CalendarOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, calendar_offline_handler);
diff --git a/calendar/gui/calendar-offline-handler.h b/calendar/gui/calendar-offline-handler.h
index 4b87fd659f..3cc61b4f25 100644
--- a/calendar/gui/calendar-offline-handler.h
+++ b/calendar/gui/calendar-offline-handler.h
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include "Evolution.h"
 
 #ifdef __cplusplus
@@ -47,13 +47,13 @@ typedef struct _CalendarOfflineHandlerPrivate CalendarOfflineHandlerPrivate;
 typedef struct _CalendarOfflineHandlerClass   CalendarOfflineHandlerClass;
 
 struct _CalendarOfflineHandler {
-	BonoboXObject parent;
+	BonoboObject parent;
 
 	CalendarOfflineHandlerPrivate *priv;
 };
 
 struct _CalendarOfflineHandlerClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_Offline__epv epv;
 };
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index eea785df33..60b59f3b9e 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -100,14 +100,14 @@ static void impl_editNew (PortableServer_Servant servant,
 			  const GNOME_Evolution_Calendar_CalObjType type,
 			  CORBA_Environment *ev);
 
-static BonoboXObjectClass *parent_class = NULL;
+static BonoboObjectClass *parent_class = NULL;
 
 
 
-BONOBO_X_TYPE_FUNC_FULL (CompEditorFactory,
-			 GNOME_Evolution_Calendar_CompEditorFactory,
-			 BONOBO_X_OBJECT_TYPE,
-			 comp_editor_factory);
+BONOBO_TYPE_FUNC_FULL (CompEditorFactory,
+		       GNOME_Evolution_Calendar_CompEditorFactory,
+		       BONOBO_OBJECT_TYPE,
+		       comp_editor_factory);
 
 /* Class initialization function for the component editor factory */
 static void
@@ -117,7 +117,7 @@ comp_editor_factory_class_init (CompEditorFactoryClass *class)
 
 	object_class = (GtkObjectClass *) class;
 
-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);
+	parent_class = gtk_type_class (BONOBO_OBJECT_TYPE);
 
 	class->epv.editExisting = impl_editExisting;
 	class->epv.editNew = impl_editNew;
diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h
index 21e27941fc..fca4573497 100644
--- a/calendar/gui/comp-editor-factory.h
+++ b/calendar/gui/comp-editor-factory.h
@@ -21,7 +21,7 @@
 #ifndef COMP_EDITOR_FACTORY_H
 #define COMP_EDITOR_FACTORY_H
 
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include "evolution-calendar.h"
 
 
@@ -37,14 +37,14 @@
 typedef struct CompEditorFactoryPrivate CompEditorFactoryPrivate;
 
 typedef struct {
-	BonoboXObject xobject;
+	BonoboObject object;
 
 	/* Private data */
 	CompEditorFactoryPrivate *priv;
 } CompEditorFactory;
 
 typedef struct {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_Calendar_CompEditorFactory__epv epv;
 } CompEditorFactoryClass;