Make Evolution compile with the latest Bonobo changes.

Make Evolution compile with the latest Bonobo changes.

Miguel.

svn path=/trunk/; revision=1636

5 files changed, 34 insertions, 34 deletions

diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
index aef37e29cd..022fb183f1 100644
--- a/calendar/pcs/cal-factory.c
+++ b/calendar/pcs/cal-factory.c
@@ -41,7 +41,7 @@ static void cal_factory_destroy (GtkObject *object);
 
 static POA_GNOME_Calendar_CalFactory__vepv cal_factory_vepv;
 
-static GnomeObjectClass *parent_class;
+static BonoboObjectClass *parent_class;
 
 
 
@@ -71,7 +71,7 @@ cal_factory_get_type (void)
 			(GtkClassInitFunc) NULL
 		};
 
-		cal_factory_type = gtk_type_unique (gnome_object_get_type (), &cal_factory_info);
+		cal_factory_type = gtk_type_unique (bonobo_object_get_type (), &cal_factory_info);
 	}
 
 	return cal_factory_type;
@@ -81,7 +81,7 @@ cal_factory_get_type (void)
 static void
 init_cal_factory_corba_class (void)
 {
-	cal_factory_vepv.GNOME_Unknown_epv = gnome_object_get_epv ();
+	cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
 	cal_factory_vepv.GNOME_Calendar_CalFactory_epv = cal_factory_get_epv ();
 }
 
@@ -93,7 +93,7 @@ cal_factory_class_init (CalFactoryClass *class)
 
 	object_class = (GtkObjectClass *) class;
 
-	parent_class = gtk_type_class (gnome_object_get_type ());
+	parent_class = gtk_type_class (bonobo_object_get_type ());
 
 	object_class->destroy = cal_factory_destroy;
 
@@ -165,7 +165,7 @@ CalFactory_load (PortableServer_Servant servant,
 	CORBA_Environment ev2;
 	gboolean result;
 
-	factory = CAL_FACTORY (gnome_object_from_servant (servant));
+	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
 	priv = factory->priv;
 
 	CORBA_exception_init (&ev2);
@@ -194,7 +194,7 @@ CalFactory_create (PortableServer_Servant servant,
 	CalFactory *factory;
 	CalFactoryPrivate *priv;
 
-	factory = CAL_FACTORY (gnome_object_from_servant (servant));
+	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
 	priv = factory->priv;
 
 	cal_factory_create (factory, uri, listener);
@@ -309,7 +309,7 @@ add_calendar_client (CalFactory *factory, CalBackend *backend, GNOME_Calendar_Li
 	CORBA_exception_init (&ev);
 	GNOME_Calendar_Listener_cal_loaded (listener,
 					    GNOME_Calendar_Listener_SUCESSS,
-					    gnome_object_corba_objref (GNOME_OBJECT (cal)),
+					    bonobo_object_corba_objref (BONOBO_OBJECT (cal)),
 					    &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -395,13 +395,13 @@ cal_factory_construct (CalFactory *factory, GNOME_Calendar_CalFactory corba_fact
 	g_return_val_if_fail (factory != NULL, NULL);
 	g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL);
 
-	gnome_object_construct (GNOME_OBJECT (factory), corba_factory);
+	bonobo_object_construct (BONOBO_OBJECT (factory), corba_factory);
 	return factory;
 }
 
 /**
  * cal_factory_corba_object_create:
- * @object: #GnomeObject that will wrap the CORBA object.
+ * @object: #BonoboObject that will wrap the CORBA object.
  *
  * Creates and activates the CORBA object that is wrapped by the specified
  * calendar factory @object.
@@ -410,7 +410,7 @@ cal_factory_construct (CalFactory *factory, GNOME_Calendar_CalFactory corba_fact
  * failure.
  **/
 GNOME_Calendar_CalFactory
-cal_factory_corba_object_create (GnomeObject *object)
+cal_factory_corba_object_create (BonoboObject *object)
 {
 	POA_GNOME_Calendar_CalFactory *servant;
 	CORBA_Environment ev;
@@ -418,7 +418,7 @@ cal_factory_corba_object_create (GnomeObject *object)
 	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
 	g_return_val_if_fail (IS_CAL_FACTORY (object), CORBA_OBJECT_NIL);
 
-	servant = (POA_GNOME_Calendar_CalFactory *) g_new0 (GnomeObjectServant, 1);
+	servant = (POA_GNOME_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &cal_factory_vepv;
 
 	CORBA_exception_init (&ev);
@@ -432,7 +432,7 @@ cal_factory_corba_object_create (GnomeObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (GNOME_Calendar_CalFactory) gnome_object_activate_servant (object, servant);
+	return (GNOME_Calendar_CalFactory) bonobo_object_activate_servant (object, servant);
 }
 
 /**
@@ -454,7 +454,7 @@ cal_factory_new (void)
 
 	factory = gtk_type_new (CAL_FACTORY_TYPE);
 
-	corba_factory = cal_factory_corba_object_create (GNOME_OBJECT (factory));
+	corba_factory = cal_factory_corba_object_create (BONOBO_OBJECT (factory));
 
 	CORBA_exception_init (&ev);
 	retval = CORBA_Object_is_nil (corba_factory, &ev);
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
index 0c227148c2..18f59d48b8 100644
--- a/calendar/pcs/cal-factory.h
+++ b/calendar/pcs/cal-factory.h
@@ -23,7 +23,7 @@
 #define CAL_FACTORY_H
 
 #include <libgnome/gnome-defs.h>
-#include <bonobo/gnome-object.h>
+#include <bonobo/bonobo-object.h>
 #include "gnome-calendar.h"
 
 BEGIN_GNOME_DECLS
@@ -41,20 +41,20 @@ typedef struct _CalFactory CalFactory;
 typedef struct _CalFactoryClass CalFactoryClass;
 
 struct _CalFactory {
-	GnomeObject object;
+	BonoboObject object;
 
 	/* Private data */
 	gpointer priv;
 };
 
 struct _CalFactoryClass {
-	GnomeObjectClass parent_class;
+	BonoboObjectClass parent_class;
 };
 
 GtkType cal_factory_get_type (void);
 
 CalFactory *cal_factory_construct (CalFactory *factory, GNOME_Calendar_CalFactory corba_factory);
-GNOME_Calendar_CalFactory cal_factory_corba_object_create (GnomeObject *object);
+GNOME_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
 
 CalFactory *cal_factory_new (void);
 
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index f855def92b..2ddef9df37 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -42,7 +42,7 @@ static void cal_destroy (GtkObject *object);
 
 static POA_GNOME_Calendar_Cal__vepv cal_vepv;
 
-static GnomeObjectClass *parent_class;
+static BonoboObjectClass *parent_class;
 
 
 
@@ -72,7 +72,7 @@ cal_get_type (void)
 			(GtkClassInitFunc) NULL
 		};
 
-		cal_type = gtk_type_unique (GNOME_OBJECT_TYPE, &cal_info);
+		cal_type = gtk_type_unique (BONOBO_OBJECT_TYPE, &cal_info);
 	}
 
 	return cal_type;
@@ -82,7 +82,7 @@ cal_get_type (void)
 static void
 init_cal_corba_class (void)
 {
-	cal_vepv.GNOME_Unknown_epv = gnome_object_get_epv ();
+	cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
 	cal_vepv.GNOME_Calendar_Cal_epv = cal_get_epv ();
 }
 
@@ -94,7 +94,7 @@ cal_class_init (CalClass *class)
 
 	object_class = (GtkObjectClass *) class;
 
-	parent_class = gtk_type_class (GNOME_OBJECT_TYPE);
+	parent_class = gtk_type_class (BONOBO_OBJECT_TYPE);
 
 	object_class->destroy = cal_destroy;
 
@@ -155,7 +155,7 @@ Cal_get_uri (PortableServer_Servant servant,
 	char *str_uri;
 	CORBA_char *str_uri_copy;
 
-	cal = CAL (gnome_object_from_servant (servant));
+	cal = CAL (bonobo_object_from_servant (servant));
 	priv = cal->priv;
 
 	uri = cal_backend_get_uri (priv->backend);
@@ -230,13 +230,13 @@ cal_construct (Cal *cal,
 
 	priv->backend = backend;
 
-	gnome_object_construct (GNOME_OBJECT (cal), corba_cal);
+	bonobo_object_construct (BONOBO_OBJECT (cal), corba_cal);
 	return cal;
 }
 
 /**
  * cal_corba_object_create:
- * @object: #GnomeObject that will wrap the CORBA object.
+ * @object: #BonoboObject that will wrap the CORBA object.
  *
  * Creates and activates the CORBA object that is wrapped by the specified
  * calendar client interface @object.
@@ -245,7 +245,7 @@ cal_construct (Cal *cal,
  * failure.
  **/
 GNOME_Calendar_Cal
-cal_corba_object_create (GnomeObject *object)
+cal_corba_object_create (BonoboObject *object)
 {
 	POA_GNOME_Calendar_Cal *servant;
 	CORBA_Environment ev;
@@ -253,7 +253,7 @@ cal_corba_object_create (GnomeObject *object)
 	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
 	g_return_val_if_fail (IS_CAL (object), CORBA_OBJECT_NIL);
 
-	servant = (POA_GNOME_Calendar_Cal *) g_new0 (GnomeObjectServant, 1);
+	servant = (POA_GNOME_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &cal_vepv;
 
 	CORBA_exception_init (&ev);
@@ -266,7 +266,7 @@ cal_corba_object_create (GnomeObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (GNOME_Calendar_Cal) gnome_object_activate_servant (object, servant);
+	return (GNOME_Calendar_Cal) bonobo_object_activate_servant (object, servant);
 }
 
 /**
@@ -292,7 +292,7 @@ cal_new (CalBackend *backend, GNOME_Calendar_Listener listener)
 	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
 
 	cal = CAL (gtk_type_new (CAL_TYPE));
-	corba_cal = cal_corba_object_create (GNOME_OBJECT (cal));
+	corba_cal = cal_corba_object_create (BONOBO_OBJECT (cal));
 
 	CORBA_exception_init (&ev);
 	ret = CORBA_Object_is_nil ((CORBA_Object) corba_cal, &ev);
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
index 80d349d44d..9ac7abc06d 100644
--- a/calendar/pcs/cal.h
+++ b/calendar/pcs/cal.h
@@ -23,7 +23,7 @@
 #define CAL_H
 
 #include <libgnome/gnome-defs.h>
-#include <bonobo/gnome-object.h>
+#include <bonobo/bonobo-object.h>
 #include "gnome-calendar.h"
 #include "cal-common.h"
 
@@ -38,14 +38,14 @@ BEGIN_GNOME_DECLS
 #define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
 
 struct _Cal {
-	GnomeObject object;
+	BonoboObject object;
 
 	/* Private data */
 	gpointer priv;
 };
 
 struct _CalClass {
-	GnomeObjectClass parent_class;
+	BonoboObjectClass parent_class;
 };
 
 GtkType cal_get_type (void);
@@ -54,7 +54,7 @@ Cal *cal_construct (Cal *cal,
 		    GNOME_Calendar_Cal corba_cal,
 		    CalBackend *backend,
 		    GNOME_Calendar_Listener listener);
-GNOME_Calendar_Cal cal_corba_object_create (GnomeObject *object);
+GNOME_Calendar_Cal cal_corba_object_create (BonoboObject *object);
 
 Cal *cal_new (CalBackend *backend, GNOME_Calendar_Listener listener);
 
diff --git a/calendar/pcs/tlacuache.c b/calendar/pcs/tlacuache.c
index 0af24d1829..b11b5030d8 100644
--- a/calendar/pcs/tlacuache.c
+++ b/calendar/pcs/tlacuache.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <libgnorba/gnorba.h>
-#include <bonobo/gnome-bonobo.h>
+#include <bonobo.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include "cal-factory.h"
 #include "calobj.h"
@@ -68,7 +68,7 @@ create_cal_factory (void)
 		return FALSE;
 	}
 
-	object = gnome_object_corba_objref (GNOME_OBJECT (factory));
+	object = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
 
 	CORBA_exception_init (&ev);
 	result = goad_server_register (CORBA_OBJECT_NIL,