diff options
Diffstat (limited to 'calendar/pcs/cal-factory.c')
-rw-r--r-- | calendar/pcs/cal-factory.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c index a67f8b777f..3834c34e62 100644 --- a/calendar/pcs/cal-factory.c +++ b/calendar/pcs/cal-factory.c @@ -51,7 +51,7 @@ static void cal_factory_class_init (CalFactoryClass *class); static void cal_factory_init (CalFactory *factory); static void cal_factory_destroy (GtkObject *object); -static POA_Evolution_Calendar_CalFactory__vepv cal_factory_vepv; +static POA_GNOME_Evolution_Calendar_CalFactory__vepv cal_factory_vepv; static BonoboObjectClass *parent_class; @@ -96,7 +96,7 @@ static void init_cal_factory_corba_class (void) { cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); - cal_factory_vepv.Evolution_Calendar_CalFactory_epv = cal_factory_get_epv (); + cal_factory_vepv.GNOME_Evolution_Calendar_CalFactory_epv = cal_factory_get_epv (); } /* Class initialization function for the calendar factory */ @@ -203,17 +203,17 @@ cal_factory_destroy (GtkObject *object) typedef struct { CalFactory *factory; char *uri; - Evolution_Calendar_Listener listener; + GNOME_Evolution_Calendar_Listener listener; } LoadCreateJobData; /* Queues a load or create request */ static void -queue_load_create_job (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener, +queue_load_create_job (CalFactory *factory, const char *uri, GNOME_Evolution_Calendar_Listener listener, JobFunc func) { LoadCreateJobData *jd; CORBA_Environment ev; - Evolution_Calendar_Listener listener_copy; + GNOME_Evolution_Calendar_Listener listener_copy; gboolean result; g_assert (uri != NULL); @@ -321,7 +321,7 @@ add_backend (CalFactory *factory, GnomeVFSURI *uri, CalBackend *backend) * MethodNotSupported error code. */ static CalBackend * -launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener) +launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener) { CalFactoryPrivate *priv; char *method; @@ -339,9 +339,9 @@ launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calenda CORBA_Environment ev; CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded ( + GNOME_Evolution_Calendar_Listener_notifyCalLoaded ( listener, - Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED, + GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED, CORBA_OBJECT_NIL, &ev); @@ -361,7 +361,7 @@ launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calenda /* Loads a calendar backend and puts it in the factory's backend hash table */ static CalBackend * -load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener) +load_backend (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener) { CalFactoryPrivate *priv; CalBackend *backend; @@ -385,8 +385,8 @@ load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener gtk_object_unref (GTK_OBJECT (backend)); CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded (listener, - Evolution_Calendar_Listener_ERROR, + GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener, + GNOME_Evolution_Calendar_Listener_ERROR, CORBA_OBJECT_NIL, &ev); @@ -404,7 +404,7 @@ load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener /* Creates a calendar backend and puts it in the factory's backend hash table */ static CalBackend * -create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener) +create_backend (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener) { CalFactoryPrivate *priv; CalBackend *backend; @@ -423,8 +423,8 @@ create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listen CORBA_Environment ev; CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded (listener, - Evolution_Calendar_Listener_ERROR, + GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener, + GNOME_Evolution_Calendar_Listener_ERROR, CORBA_OBJECT_NIL, &ev); @@ -444,7 +444,7 @@ create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listen * object. */ static void -add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calendar_Listener listener) +add_calendar_client (CalFactory *factory, CalBackend *backend, GNOME_Evolution_Calendar_Listener listener) { Cal *cal; CORBA_Environment ev; @@ -454,8 +454,8 @@ add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calenda g_message ("add_calendar_client(): could not create the calendar client interface"); CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded (listener, - Evolution_Calendar_Listener_ERROR, + GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener, + GNOME_Evolution_Calendar_Listener_ERROR, CORBA_OBJECT_NIL, &ev); if (ev._major != CORBA_NO_EXCEPTION) @@ -468,8 +468,8 @@ add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calenda cal_backend_add_cal (backend, cal); CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded (listener, - Evolution_Calendar_Listener_SUCCESS, + GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener, + GNOME_Evolution_Calendar_Listener_SUCCESS, bonobo_object_corba_objref (BONOBO_OBJECT (cal)), &ev); @@ -488,7 +488,7 @@ load_fn (gpointer data) LoadCreateJobData *jd; CalFactory *factory; GnomeVFSURI *uri; - Evolution_Calendar_Listener listener; + GNOME_Evolution_Calendar_Listener listener; CalBackend *backend; CORBA_Environment ev; @@ -506,8 +506,8 @@ load_fn (gpointer data) if (!uri) { CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded (listener, - Evolution_Calendar_Listener_ERROR, + GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener, + GNOME_Evolution_Calendar_Listener_ERROR, CORBA_OBJECT_NIL, &ev); @@ -548,7 +548,7 @@ create_fn (gpointer data) LoadCreateJobData *jd; CalFactory *factory; GnomeVFSURI *uri; - Evolution_Calendar_Listener listener; + GNOME_Evolution_Calendar_Listener listener; CalBackend *backend; CORBA_Environment ev; @@ -566,8 +566,8 @@ create_fn (gpointer data) if (!uri) { CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded (listener, - Evolution_Calendar_Listener_ERROR, + GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener, + GNOME_Evolution_Calendar_Listener_ERROR, CORBA_OBJECT_NIL, &ev); @@ -584,8 +584,8 @@ create_fn (gpointer data) if (backend) { CORBA_exception_init (&ev); - Evolution_Calendar_Listener_cal_loaded (listener, - Evolution_Calendar_Listener_IN_USE, + GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener, + GNOME_Evolution_Calendar_Listener_IN_USE, CORBA_OBJECT_NIL, &ev); @@ -624,7 +624,7 @@ create_fn (gpointer data) static void CalFactory_load (PortableServer_Servant servant, const CORBA_char *uri, - Evolution_Calendar_Listener listener, + GNOME_Evolution_Calendar_Listener listener, CORBA_Environment *ev) { CalFactory *factory; @@ -640,7 +640,7 @@ CalFactory_load (PortableServer_Servant servant, if (ev2._major != CORBA_NO_EXCEPTION || result) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_CalFactory_NilListener, + ex_GNOME_Evolution_Calendar_CalFactory_NilListener, NULL); CORBA_exception_free (&ev2); @@ -655,7 +655,7 @@ CalFactory_load (PortableServer_Servant servant, static void CalFactory_create (PortableServer_Servant servant, const CORBA_char *uri, - Evolution_Calendar_Listener listener, + GNOME_Evolution_Calendar_Listener listener, CORBA_Environment *ev) { CalFactory *factory; @@ -675,12 +675,12 @@ CalFactory_create (PortableServer_Servant servant, * * Return value: A newly-allocated EPV. **/ -POA_Evolution_Calendar_CalFactory__epv * +POA_GNOME_Evolution_Calendar_CalFactory__epv * cal_factory_get_epv (void) { - POA_Evolution_Calendar_CalFactory__epv *epv; + POA_GNOME_Evolution_Calendar_CalFactory__epv *epv; - epv = g_new0 (POA_Evolution_Calendar_CalFactory__epv, 1); + epv = g_new0 (POA_GNOME_Evolution_Calendar_CalFactory__epv, 1); epv->load = CalFactory_load; epv->create = CalFactory_create; @@ -700,7 +700,7 @@ cal_factory_get_epv (void) * Return value: The same object as the @factory argument. **/ CalFactory * -cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory) +cal_factory_construct (CalFactory *factory, GNOME_Evolution_Calendar_CalFactory corba_factory) { g_return_val_if_fail (factory != NULL, NULL); g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL); @@ -719,20 +719,20 @@ cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_ * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of * failure. **/ -Evolution_Calendar_CalFactory +GNOME_Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object) { - POA_Evolution_Calendar_CalFactory *servant; + POA_GNOME_Evolution_Calendar_CalFactory *servant; CORBA_Environment ev; g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL); g_return_val_if_fail (IS_CAL_FACTORY (object), CORBA_OBJECT_NIL); - servant = (POA_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1); servant->vepv = &cal_factory_vepv; CORBA_exception_init (&ev); - POA_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_message ("cal_factory_corba_object_create(): could not init the servant"); @@ -742,7 +742,7 @@ cal_factory_corba_object_create (BonoboObject *object) } CORBA_exception_free (&ev); - return (Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant); + return (GNOME_Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant); } /** @@ -759,7 +759,7 @@ cal_factory_new (void) { CalFactory *factory; CORBA_Environment ev; - Evolution_Calendar_CalFactory corba_factory; + GNOME_Evolution_Calendar_CalFactory corba_factory; gboolean retval; factory = gtk_type_new (CAL_FACTORY_TYPE); |