diff options
author | Arturo Espinosa <unammx@src.gnome.org> | 2000-01-26 08:04:16 +0800 |
---|---|---|
committer | Arturo Espinosa <unammx@src.gnome.org> | 2000-01-26 08:04:16 +0800 |
commit | 9f31ce86ff0ac0c7997e977647339ffb2db0fd63 (patch) | |
tree | 36a8cf18685d0aae7a37169c72f57b53e44f94f0 /calendar | |
parent | 490b4ff6ec666a14e4f4bf0431aa7aa15b452366 (diff) | |
download | gsoc2013-evolution-9f31ce86ff0ac0c7997e977647339ffb2db0fd63.tar.gz gsoc2013-evolution-9f31ce86ff0ac0c7997e977647339ffb2db0fd63.tar.zst gsoc2013-evolution-9f31ce86ff0ac0c7997e977647339ffb2db0fd63.zip |
Make Evolution compile with the latest Bonobo changes.
Make Evolution compile with the latest Bonobo changes.
Miguel.
svn path=/trunk/; revision=1636
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/GnomeCal.idl | 2 | ||||
-rw-r--r-- | calendar/Makefile.am | 3 | ||||
-rw-r--r-- | calendar/cal-client.c | 2 | ||||
-rw-r--r-- | calendar/cal-client/cal-client.c | 2 | ||||
-rw-r--r-- | calendar/cal-client/cal-listener.c | 28 | ||||
-rw-r--r-- | calendar/cal-client/cal-listener.h | 8 | ||||
-rw-r--r-- | calendar/cal-factory.c | 26 | ||||
-rw-r--r-- | calendar/cal-factory.h | 8 | ||||
-rw-r--r-- | calendar/cal-listener.c | 28 | ||||
-rw-r--r-- | calendar/cal-listener.h | 8 | ||||
-rw-r--r-- | calendar/cal.c | 22 | ||||
-rw-r--r-- | calendar/cal.h | 8 | ||||
-rw-r--r-- | calendar/corba-cal-factory.c | 18 | ||||
-rw-r--r-- | calendar/evolution-calendar.idl | 8 | ||||
-rw-r--r-- | calendar/gui/GnomeCal.idl | 2 | ||||
-rw-r--r-- | calendar/gui/Makefile.am | 3 | ||||
-rw-r--r-- | calendar/gui/corba-cal-factory.c | 18 | ||||
-rw-r--r-- | calendar/gui/prop.c | 2 | ||||
-rw-r--r-- | calendar/idl/evolution-calendar.idl | 8 | ||||
-rw-r--r-- | calendar/pcs/cal-factory.c | 26 | ||||
-rw-r--r-- | calendar/pcs/cal-factory.h | 8 | ||||
-rw-r--r-- | calendar/pcs/cal.c | 22 | ||||
-rw-r--r-- | calendar/pcs/cal.h | 8 | ||||
-rw-r--r-- | calendar/pcs/tlacuache.c | 4 | ||||
-rw-r--r-- | calendar/prop.c | 2 | ||||
-rw-r--r-- | calendar/tlacuache.c | 4 |
26 files changed, 140 insertions, 138 deletions
diff --git a/calendar/GnomeCal.idl b/calendar/GnomeCal.idl index a58358f3f1..1e426fae36 100644 --- a/calendar/GnomeCal.idl +++ b/calendar/GnomeCal.idl @@ -1,3 +1,5 @@ +#include <Bonobo.idl> + module GNOME { module Calendar { diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 89f6becfa1..fd7767ebcc 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -138,8 +138,7 @@ tlacuache_SOURCES = \ tlacuache.c LINK_FLAGS = \ - $(GNOME_LIBDIR) \ - $(GNOMEGNORBA_LIBS) \ + $(BONOBO_VFS_GNOME_LIBS) \ $(INTLLIBS) \ ../libversit/libversit.la diff --git a/calendar/cal-client.c b/calendar/cal-client.c index 0f6b31c06a..91d83d2cad 100644 --- a/calendar/cal-client.c +++ b/calendar/cal-client.c @@ -270,7 +270,7 @@ cal_client_load_calendar (CalClient *client, const char *str_uri) return FALSE; } - corba_listener = (GNOME_Calendar_Listener) gnome_object_corba_objref (priv->listener); + corba_listener = (GNOME_Calendar_Listener) bonobo_object_corba_objref (priv->listener); CORBA_exception_init (&ev); diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 0f6b31c06a..91d83d2cad 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -270,7 +270,7 @@ cal_client_load_calendar (CalClient *client, const char *str_uri) return FALSE; } - corba_listener = (GNOME_Calendar_Listener) gnome_object_corba_objref (priv->listener); + corba_listener = (GNOME_Calendar_Listener) bonobo_object_corba_objref (priv->listener); CORBA_exception_init (&ev); diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c index 8583a689c8..a5a37a12d9 100644 --- a/calendar/cal-client/cal-listener.c +++ b/calendar/cal-client/cal-listener.c @@ -51,7 +51,7 @@ static POA_GNOME_Calendar_Listener__vepv cal_listener_vepv; static guint cal_listener_signals[LAST_SIGNAL]; -static GnomeObjectClass *parent_class; +static BonoboObjectClass *parent_class; @@ -81,7 +81,7 @@ cal_listener_get_type (void) (GtkClassInitFunc) NULL }; - cal_listener_type = gtk_type_unique (gnome_object_get_type (), &cal_listener_info); + cal_listener_type = gtk_type_unique (bonobo_object_get_type (), &cal_listener_info); } return cal_listener_type; @@ -91,7 +91,7 @@ cal_listener_get_type (void) static void init_cal_listener_corba_class (void) { - cal_listener_vepv.GNOME_Unknown_epv = gnome_object_get_epv (); + cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); cal_listener_vepv.GNOME_Calendar_Listener_epv = cal_listener_get_epv (); } @@ -103,7 +103,7 @@ cal_listener_class_init (CalListenerClass *class) object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (gnome_object_get_type ()); + parent_class = gtk_type_class (bonobo_object_get_type ()); cal_listener_signals[CAL_LOADED] = gtk_signal_new ("cal_loaded", @@ -227,7 +227,7 @@ Listener_cal_loaded (PortableServer_Servant servant, GNOME_Calendar_Cal cal_copy; CalListenerLoadStatus load_status; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); priv = listener->priv; if (priv->cal != CORBA_OBJECT_NIL) { @@ -273,7 +273,7 @@ Listener_obj_added (PortableServer_Servant servant, { CalListener *listener; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_ADDED], calobj); } @@ -286,7 +286,7 @@ Listener_obj_removed (PortableServer_Servant servant, { CalListener *listener; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_REMOVED], uid); } @@ -299,7 +299,7 @@ Listener_obj_changed (PortableServer_Servant servant, { CalListener *listener; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_CHANGED], calobj); } @@ -344,13 +344,13 @@ cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_lis g_return_val_if_fail (listener != NULL, NULL); g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL); - gnome_object_construct (GNOME_OBJECT (listener), corba_listener); + bonobo_object_construct (BONOBO_OBJECT (listener), corba_listener); return listener; } /** * cal_listener_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 listener @object. @@ -359,7 +359,7 @@ cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_lis * failure. **/ GNOME_Calendar_Listener -cal_listener_corba_object_create (GnomeObject *object) +cal_listener_corba_object_create (BonoboObject *object) { POA_GNOME_Calendar_Listener *servant; CORBA_Environment ev; @@ -367,7 +367,7 @@ cal_listener_corba_object_create (GnomeObject *object) g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL); g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL); - servant = (POA_GNOME_Calendar_Listener *) g_new0 (GnomeObjectServant, 1); + servant = (POA_GNOME_Calendar_Listener *) g_new0 (BonoboObjectServant, 1); servant->vepv = &cal_listener_vepv; CORBA_exception_init (&ev); @@ -379,7 +379,7 @@ cal_listener_corba_object_create (GnomeObject *object) } CORBA_exception_free (&ev); - return (GNOME_Calendar_Listener) gnome_object_activate_servant (object, servant); + return (GNOME_Calendar_Listener) bonobo_object_activate_servant (object, servant); } /** @@ -401,7 +401,7 @@ cal_listener_new (void) listener = gtk_type_new (CAL_LISTENER_TYPE); - corba_listener = cal_listener_corba_object_create (GNOME_OBJECT (listener)); + corba_listener = cal_listener_corba_object_create (BONOBO_OBJECT (listener)); CORBA_exception_init (&ev); result = CORBA_Object_is_nil (corba_listener, &ev); diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h index c8d26dab80..22853212ee 100644 --- a/calendar/cal-client/cal-listener.h +++ b/calendar/cal-client/cal-listener.h @@ -23,7 +23,7 @@ #define CAL_LISTENER_H #include <libgnome/gnome-defs.h> -#include <bonobo/gnome-object.h> +#include <bonobo/bonobo-object.h> #include "gnome-calendar.h" BEGIN_GNOME_DECLS @@ -47,14 +47,14 @@ typedef enum { } CalListenerLoadStatus; struct _CalListener { - GnomeObject object; + BonoboObject object; /* Private data */ gpointer priv; }; struct _CalListenerClass { - GnomeObjectClass parent_class; + BonoboObjectClass parent_class; void (* cal_loaded) (CalListener *listener, CalListenerLoadStatus status, @@ -67,7 +67,7 @@ struct _CalListenerClass { GtkType cal_listener_get_type (void); CalListener *cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_listener); -GNOME_Calendar_Listener cal_listener_corba_object_create (GnomeObject *object); +GNOME_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object); CalListener *cal_listener_new (void); diff --git a/calendar/cal-factory.c b/calendar/cal-factory.c index aef37e29cd..022fb183f1 100644 --- a/calendar/cal-factory.c +++ b/calendar/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/cal-factory.h b/calendar/cal-factory.h index 0c227148c2..18f59d48b8 100644 --- a/calendar/cal-factory.h +++ b/calendar/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/cal-listener.c b/calendar/cal-listener.c index 8583a689c8..a5a37a12d9 100644 --- a/calendar/cal-listener.c +++ b/calendar/cal-listener.c @@ -51,7 +51,7 @@ static POA_GNOME_Calendar_Listener__vepv cal_listener_vepv; static guint cal_listener_signals[LAST_SIGNAL]; -static GnomeObjectClass *parent_class; +static BonoboObjectClass *parent_class; @@ -81,7 +81,7 @@ cal_listener_get_type (void) (GtkClassInitFunc) NULL }; - cal_listener_type = gtk_type_unique (gnome_object_get_type (), &cal_listener_info); + cal_listener_type = gtk_type_unique (bonobo_object_get_type (), &cal_listener_info); } return cal_listener_type; @@ -91,7 +91,7 @@ cal_listener_get_type (void) static void init_cal_listener_corba_class (void) { - cal_listener_vepv.GNOME_Unknown_epv = gnome_object_get_epv (); + cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); cal_listener_vepv.GNOME_Calendar_Listener_epv = cal_listener_get_epv (); } @@ -103,7 +103,7 @@ cal_listener_class_init (CalListenerClass *class) object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (gnome_object_get_type ()); + parent_class = gtk_type_class (bonobo_object_get_type ()); cal_listener_signals[CAL_LOADED] = gtk_signal_new ("cal_loaded", @@ -227,7 +227,7 @@ Listener_cal_loaded (PortableServer_Servant servant, GNOME_Calendar_Cal cal_copy; CalListenerLoadStatus load_status; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); priv = listener->priv; if (priv->cal != CORBA_OBJECT_NIL) { @@ -273,7 +273,7 @@ Listener_obj_added (PortableServer_Servant servant, { CalListener *listener; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_ADDED], calobj); } @@ -286,7 +286,7 @@ Listener_obj_removed (PortableServer_Servant servant, { CalListener *listener; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_REMOVED], uid); } @@ -299,7 +299,7 @@ Listener_obj_changed (PortableServer_Servant servant, { CalListener *listener; - listener = CAL_LISTENER (gnome_object_from_servant (servant)); + listener = CAL_LISTENER (bonobo_object_from_servant (servant)); gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_CHANGED], calobj); } @@ -344,13 +344,13 @@ cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_lis g_return_val_if_fail (listener != NULL, NULL); g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL); - gnome_object_construct (GNOME_OBJECT (listener), corba_listener); + bonobo_object_construct (BONOBO_OBJECT (listener), corba_listener); return listener; } /** * cal_listener_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 listener @object. @@ -359,7 +359,7 @@ cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_lis * failure. **/ GNOME_Calendar_Listener -cal_listener_corba_object_create (GnomeObject *object) +cal_listener_corba_object_create (BonoboObject *object) { POA_GNOME_Calendar_Listener *servant; CORBA_Environment ev; @@ -367,7 +367,7 @@ cal_listener_corba_object_create (GnomeObject *object) g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL); g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL); - servant = (POA_GNOME_Calendar_Listener *) g_new0 (GnomeObjectServant, 1); + servant = (POA_GNOME_Calendar_Listener *) g_new0 (BonoboObjectServant, 1); servant->vepv = &cal_listener_vepv; CORBA_exception_init (&ev); @@ -379,7 +379,7 @@ cal_listener_corba_object_create (GnomeObject *object) } CORBA_exception_free (&ev); - return (GNOME_Calendar_Listener) gnome_object_activate_servant (object, servant); + return (GNOME_Calendar_Listener) bonobo_object_activate_servant (object, servant); } /** @@ -401,7 +401,7 @@ cal_listener_new (void) listener = gtk_type_new (CAL_LISTENER_TYPE); - corba_listener = cal_listener_corba_object_create (GNOME_OBJECT (listener)); + corba_listener = cal_listener_corba_object_create (BONOBO_OBJECT (listener)); CORBA_exception_init (&ev); result = CORBA_Object_is_nil (corba_listener, &ev); diff --git a/calendar/cal-listener.h b/calendar/cal-listener.h index c8d26dab80..22853212ee 100644 --- a/calendar/cal-listener.h +++ b/calendar/cal-listener.h @@ -23,7 +23,7 @@ #define CAL_LISTENER_H #include <libgnome/gnome-defs.h> -#include <bonobo/gnome-object.h> +#include <bonobo/bonobo-object.h> #include "gnome-calendar.h" BEGIN_GNOME_DECLS @@ -47,14 +47,14 @@ typedef enum { } CalListenerLoadStatus; struct _CalListener { - GnomeObject object; + BonoboObject object; /* Private data */ gpointer priv; }; struct _CalListenerClass { - GnomeObjectClass parent_class; + BonoboObjectClass parent_class; void (* cal_loaded) (CalListener *listener, CalListenerLoadStatus status, @@ -67,7 +67,7 @@ struct _CalListenerClass { GtkType cal_listener_get_type (void); CalListener *cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_listener); -GNOME_Calendar_Listener cal_listener_corba_object_create (GnomeObject *object); +GNOME_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object); CalListener *cal_listener_new (void); diff --git a/calendar/cal.c b/calendar/cal.c index f855def92b..2ddef9df37 100644 --- a/calendar/cal.c +++ b/calendar/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/cal.h b/calendar/cal.h index 80d349d44d..9ac7abc06d 100644 --- a/calendar/cal.h +++ b/calendar/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/corba-cal-factory.c b/calendar/corba-cal-factory.c index c10929376b..a86af3c238 100644 --- a/calendar/corba-cal-factory.c +++ b/calendar/corba-cal-factory.c @@ -14,8 +14,8 @@ #include "alarm.h" #include "timeutil.h" #include "../libversit/vcc.h" -#include <libgnorba/gnome-factory.h> #include <libgnorba/gnorba.h> +#include <bonobo.h> #include "GnomeCal.h" #include "corba-cal-factory.h" #include "corba-cal.h" @@ -24,14 +24,14 @@ CORBA_ORB orb; PortableServer_POA poa; PortableServer_POAManager poa_manager; -static POA_GNOME_GenericFactory__epv calendar_epv; -static POA_GNOME_GenericFactory__vepv calendar_vepv; +static POA_Bonobo_GenericFactory__epv calendar_epv; +static POA_Bonobo_GenericFactory__vepv calendar_vepv; /* * Servant and Object Factory */ -static POA_GNOME_GenericFactory calendar_servant; -static GNOME_GenericFactory calendar_factory; +static POA_Bonobo_GenericFactory calendar_servant; +static Bonobo_GenericFactory calendar_factory; static CORBA_boolean calendar_supports (PortableServer_Servant servant, @@ -61,7 +61,7 @@ calendar_create_object (PortableServer_Servant servant, if (strcmp (goad_id, "IDL:GNOME:Calendar:Repository:1.0") != 0){ CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_GenericFactory_CannotActivate, + ex_Bonobo_GenericFactory_CannotActivate, NULL); return CORBA_OBJECT_NIL; } @@ -72,7 +72,7 @@ calendar_create_object (PortableServer_Servant servant, if (stat (name, &s) != 0){ CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_GenericFactory_CannotActivate, + ex_Bonobo_GenericFactory_CannotActivate, NULL); return CORBA_OBJECT_NIL; } @@ -99,12 +99,12 @@ init_corba_server (void) PortableServer_POAManager_activate (poa_manager, &ev); /* First create the locator for the repositories as a factory object */ - calendar_vepv.GNOME_GenericFactory_epv = &calendar_epv; + calendar_vepv.Bonobo_GenericFactory_epv = &calendar_epv; calendar_epv.supports = calendar_supports; calendar_epv.create_object = calendar_create_object; calendar_servant.vepv = &calendar_vepv; - POA_GNOME_GenericFactory__init ((PortableServer_Servant) &calendar_servant, &ev); + POA_Bonobo_GenericFactory__init ((PortableServer_Servant) &calendar_servant, &ev); CORBA_free (PortableServer_POA_activate_object ( poa, (PortableServer_Servant)&calendar_servant, &ev)); diff --git a/calendar/evolution-calendar.idl b/calendar/evolution-calendar.idl index 5c39956170..4fc6edd9b2 100644 --- a/calendar/evolution-calendar.idl +++ b/calendar/evolution-calendar.idl @@ -10,7 +10,7 @@ #ifndef _GNOME_CALENDAR_IDL_ #define _GNOME_CALENDAR_IDL_ -#include <gnome-unknown.idl> +#include <Bonobo.idl> module GNOME { @@ -26,13 +26,13 @@ module Calendar { interface Listener; /* Calendar client interface */ - interface Cal : Unknown { + interface Cal : Bonobo::Unknown { /* A calendar is identified by its URI */ readonly attribute string uri; }; /* Listener for changes in a calendar */ - interface Listener : Unknown { + interface Listener : Bonobo::Unknown { /* Return status when loading a calendar; we need better error reporting */ enum LoadStatus { SUCESSS, @@ -55,7 +55,7 @@ module Calendar { }; /* A calendar factory, can load and create calendars */ - interface CalFactory : Unknown { + interface CalFactory : Bonobo::Unknown { exception NilListener {}; /* Load a calendar from an URI */ diff --git a/calendar/gui/GnomeCal.idl b/calendar/gui/GnomeCal.idl index a58358f3f1..1e426fae36 100644 --- a/calendar/gui/GnomeCal.idl +++ b/calendar/gui/GnomeCal.idl @@ -1,3 +1,5 @@ +#include <Bonobo.idl> + module GNOME { module Calendar { diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 89f6becfa1..fd7767ebcc 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -138,8 +138,7 @@ tlacuache_SOURCES = \ tlacuache.c LINK_FLAGS = \ - $(GNOME_LIBDIR) \ - $(GNOMEGNORBA_LIBS) \ + $(BONOBO_VFS_GNOME_LIBS) \ $(INTLLIBS) \ ../libversit/libversit.la diff --git a/calendar/gui/corba-cal-factory.c b/calendar/gui/corba-cal-factory.c index c10929376b..a86af3c238 100644 --- a/calendar/gui/corba-cal-factory.c +++ b/calendar/gui/corba-cal-factory.c @@ -14,8 +14,8 @@ #include "alarm.h" #include "timeutil.h" #include "../libversit/vcc.h" -#include <libgnorba/gnome-factory.h> #include <libgnorba/gnorba.h> +#include <bonobo.h> #include "GnomeCal.h" #include "corba-cal-factory.h" #include "corba-cal.h" @@ -24,14 +24,14 @@ CORBA_ORB orb; PortableServer_POA poa; PortableServer_POAManager poa_manager; -static POA_GNOME_GenericFactory__epv calendar_epv; -static POA_GNOME_GenericFactory__vepv calendar_vepv; +static POA_Bonobo_GenericFactory__epv calendar_epv; +static POA_Bonobo_GenericFactory__vepv calendar_vepv; /* * Servant and Object Factory */ -static POA_GNOME_GenericFactory calendar_servant; -static GNOME_GenericFactory calendar_factory; +static POA_Bonobo_GenericFactory calendar_servant; +static Bonobo_GenericFactory calendar_factory; static CORBA_boolean calendar_supports (PortableServer_Servant servant, @@ -61,7 +61,7 @@ calendar_create_object (PortableServer_Servant servant, if (strcmp (goad_id, "IDL:GNOME:Calendar:Repository:1.0") != 0){ CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_GenericFactory_CannotActivate, + ex_Bonobo_GenericFactory_CannotActivate, NULL); return CORBA_OBJECT_NIL; } @@ -72,7 +72,7 @@ calendar_create_object (PortableServer_Servant servant, if (stat (name, &s) != 0){ CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_GenericFactory_CannotActivate, + ex_Bonobo_GenericFactory_CannotActivate, NULL); return CORBA_OBJECT_NIL; } @@ -99,12 +99,12 @@ init_corba_server (void) PortableServer_POAManager_activate (poa_manager, &ev); /* First create the locator for the repositories as a factory object */ - calendar_vepv.GNOME_GenericFactory_epv = &calendar_epv; + calendar_vepv.Bonobo_GenericFactory_epv = &calendar_epv; calendar_epv.supports = calendar_supports; calendar_epv.create_object = calendar_create_object; calendar_servant.vepv = &calendar_vepv; - POA_GNOME_GenericFactory__init ((PortableServer_Servant) &calendar_servant, &ev); + POA_Bonobo_GenericFactory__init ((PortableServer_Servant) &calendar_servant, &ev); CORBA_free (PortableServer_POA_activate_object ( poa, (PortableServer_Servant)&calendar_servant, &ev)); diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c index 6f2fec605b..8e91f4d730 100644 --- a/calendar/gui/prop.c +++ b/calendar/gui/prop.c @@ -776,7 +776,7 @@ create_alarm_page (void) main_box = gtk_vbox_new (FALSE, GNOME_PAD); gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL); gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), - main_box, gtk_label_new (_("Alarms"))); + main_box, gtk_label_new (_("Alarms"))); /* build miscellaneous box */ misc_frame = gtk_frame_new (_("Alarm Properties")); diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl index 5c39956170..4fc6edd9b2 100644 --- a/calendar/idl/evolution-calendar.idl +++ b/calendar/idl/evolution-calendar.idl @@ -10,7 +10,7 @@ #ifndef _GNOME_CALENDAR_IDL_ #define _GNOME_CALENDAR_IDL_ -#include <gnome-unknown.idl> +#include <Bonobo.idl> module GNOME { @@ -26,13 +26,13 @@ module Calendar { interface Listener; /* Calendar client interface */ - interface Cal : Unknown { + interface Cal : Bonobo::Unknown { /* A calendar is identified by its URI */ readonly attribute string uri; }; /* Listener for changes in a calendar */ - interface Listener : Unknown { + interface Listener : Bonobo::Unknown { /* Return status when loading a calendar; we need better error reporting */ enum LoadStatus { SUCESSS, @@ -55,7 +55,7 @@ module Calendar { }; /* A calendar factory, can load and create calendars */ - interface CalFactory : Unknown { + interface CalFactory : Bonobo::Unknown { exception NilListener {}; /* Load a calendar from an URI */ 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, diff --git a/calendar/prop.c b/calendar/prop.c index 6f2fec605b..8e91f4d730 100644 --- a/calendar/prop.c +++ b/calendar/prop.c @@ -776,7 +776,7 @@ create_alarm_page (void) main_box = gtk_vbox_new (FALSE, GNOME_PAD); gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL); gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), - main_box, gtk_label_new (_("Alarms"))); + main_box, gtk_label_new (_("Alarms"))); /* build miscellaneous box */ misc_frame = gtk_frame_new (_("Alarm Properties")); diff --git a/calendar/tlacuache.c b/calendar/tlacuache.c index 0af24d1829..b11b5030d8 100644 --- a/calendar/tlacuache.c +++ b/calendar/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, |