diff options
Diffstat (limited to 'calendar/pcs')
-rw-r--r-- | calendar/pcs/cal-backend.c | 2 | ||||
-rw-r--r-- | calendar/pcs/cal-backend.h | 4 | ||||
-rw-r--r-- | calendar/pcs/cal-common.h | 2 | ||||
-rw-r--r-- | calendar/pcs/cal-factory.c | 74 | ||||
-rw-r--r-- | calendar/pcs/cal-factory.h | 14 | ||||
-rw-r--r-- | calendar/pcs/cal.c | 32 | ||||
-rw-r--r-- | calendar/pcs/cal.h | 14 |
7 files changed, 71 insertions, 71 deletions
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c index 6382d1f592..983edbb3cc 100644 --- a/calendar/pcs/cal-backend.c +++ b/calendar/pcs/cal-backend.c @@ -1,4 +1,4 @@ -/* GNOME calendar backend +/* Evolution calendar backend * * Copyright (C) 2000 Helix Code, Inc. * diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h index d220943c00..31f726a68f 100644 --- a/calendar/pcs/cal-backend.h +++ b/calendar/pcs/cal-backend.h @@ -1,4 +1,4 @@ -/* GNOME calendar backend +/* Evolution calendar backend * * Copyright (C) 2000 Helix Code, Inc. * @@ -24,7 +24,7 @@ #include <libgnome/gnome-defs.h> #include <libgnomevfs/gnome-vfs.h> -#include "gnome-calendar.h" +#include "evolution-calendar.h" #include "cal-common.h" #include "cal.h" diff --git a/calendar/pcs/cal-common.h b/calendar/pcs/cal-common.h index 4177dbb096..e51ddf1bdd 100644 --- a/calendar/pcs/cal-common.h +++ b/calendar/pcs/cal-common.h @@ -1,4 +1,4 @@ -/* GNOME calendar server - common declarations +/* Evolution calendar server - common declarations * * Copyright (C) 2000 Helix Code, Inc. * diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c index 022fb183f1..f544964612 100644 --- a/calendar/pcs/cal-factory.c +++ b/calendar/pcs/cal-factory.c @@ -1,4 +1,4 @@ -/* GNOME calendar factory +/* Evolution calendar factory * * Copyright (C) 2000 Helix Code, Inc. * @@ -39,7 +39,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_GNOME_Calendar_CalFactory__vepv cal_factory_vepv; +static POA_Evolution_Calendar_CalFactory__vepv cal_factory_vepv; static BonoboObjectClass *parent_class; @@ -82,7 +82,7 @@ static void init_cal_factory_corba_class (void) { cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); - cal_factory_vepv.GNOME_Calendar_CalFactory_epv = cal_factory_get_epv (); + cal_factory_vepv.Evolution_Calendar_CalFactory_epv = cal_factory_get_epv (); } /* Class initialization function for the calendar factory */ @@ -156,8 +156,8 @@ cal_factory_destroy (GtkObject *object) /* CalFactory::load method */ static void CalFactory_load (PortableServer_Servant servant, - const CORBA_char *uri, - GNOME_Calendar_Listener listener, + CORBA_char *uri, + Evolution_Calendar_Listener listener, CORBA_Environment *ev) { CalFactory *factory; @@ -173,7 +173,7 @@ CalFactory_load (PortableServer_Servant servant, if (ev2._major != CORBA_NO_EXCEPTION || result) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_Calendar_CalFactory_NilListener, + ex_Evolution_Calendar_CalFactory_NilListener, NULL); CORBA_exception_free (&ev2); @@ -187,8 +187,8 @@ CalFactory_load (PortableServer_Servant servant, /* CalFactory::create method */ static void CalFactory_create (PortableServer_Servant servant, - const CORBA_char *uri, - GNOME_Calendar_Listener listener, + CORBA_char *uri, + Evolution_Calendar_Listener listener, CORBA_Environment *ev) { CalFactory *factory; @@ -208,12 +208,12 @@ CalFactory_create (PortableServer_Servant servant, * * Return value: A newly-allocated EPV. **/ -POA_GNOME_Calendar_CalFactory__epv * +POA_Evolution_Calendar_CalFactory__epv * cal_factory_get_epv (void) { - POA_GNOME_Calendar_CalFactory__epv *epv; + POA_Evolution_Calendar_CalFactory__epv *epv; - epv = g_new0 (POA_GNOME_Calendar_CalFactory__epv, 1); + epv = g_new0 (POA_Evolution_Calendar_CalFactory__epv, 1); epv->load = CalFactory_load; epv->create = CalFactory_create; @@ -228,7 +228,7 @@ cal_factory_get_epv (void) typedef struct { CalFactory *factory; char *uri; - GNOME_Calendar_Listener listener; + Evolution_Calendar_Listener listener; } LoadCreateJobData; /* Looks up a calendar backend in a factory's hash table of uri->cal */ @@ -246,7 +246,7 @@ lookup_backend (CalFactory *factory, GnomeVFSURI *uri) /* Loads a calendar backend and puts it in the factory's backend hash table */ static CalBackend * -load_backend (CalFactory *factory, GnomeVFSURI *uri, GNOME_Calendar_Listener listener) +load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener) { CalFactoryPrivate *priv; CalBackend *backend; @@ -283,7 +283,7 @@ load_backend (CalFactory *factory, GnomeVFSURI *uri, GNOME_Calendar_Listener lis * object. */ static void -add_calendar_client (CalFactory *factory, CalBackend *backend, GNOME_Calendar_Listener listener) +add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calendar_Listener listener) { Cal *cal; CORBA_Environment ev; @@ -293,10 +293,10 @@ add_calendar_client (CalFactory *factory, CalBackend *backend, GNOME_Calendar_Li g_message ("add_calendar_client(): could not create the calendar client interface"); CORBA_exception_init (&ev); - GNOME_Calendar_Listener_cal_loaded (listener, - GNOME_Calendar_Listener_ERROR, - CORBA_OBJECT_NIL, - &ev); + Evolution_Calendar_Listener_cal_loaded (listener, + Evolution_Calendar_Listener_ERROR, + CORBA_OBJECT_NIL, + &ev); if (ev._major != CORBA_NO_EXCEPTION) g_message ("add_calendar_client(): could not notify the listener"); @@ -307,10 +307,10 @@ add_calendar_client (CalFactory *factory, CalBackend *backend, GNOME_Calendar_Li cal_backend_add_cal (backend, cal); CORBA_exception_init (&ev); - GNOME_Calendar_Listener_cal_loaded (listener, - GNOME_Calendar_Listener_SUCESSS, - bonobo_object_corba_objref (BONOBO_OBJECT (cal)), - &ev); + Evolution_Calendar_Listener_cal_loaded (listener, + Evolution_Calendar_Listener_SUCCESS, + bonobo_object_corba_objref (BONOBO_OBJECT (cal)), + &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_message ("add_calendar_client(): could not notify the listener"); @@ -327,7 +327,7 @@ load_fn (gpointer data) LoadCreateJobData *jd; CalFactory *factory; GnomeVFSURI *uri; - GNOME_Calendar_Listener listener; + Evolution_Calendar_Listener listener; CalBackend *backend; CORBA_Environment ev; @@ -352,10 +352,10 @@ load_fn (gpointer data) if (!backend) { g_message ("load_fn(): could not load the backend"); CORBA_exception_init (&ev); - GNOME_Calendar_Listener_cal_loaded (listener, - GNOME_Calendar_Listener_ERROR, - CORBA_OBJECT_NIL, - &ev); + Evolution_Calendar_Listener_cal_loaded (listener, + Evolution_Calendar_Listener_ERROR, + CORBA_OBJECT_NIL, + &ev); if (ev._major != CORBA_NO_EXCEPTION) g_message ("load_fn(): could not notify the listener"); @@ -390,7 +390,7 @@ load_fn (gpointer data) * Return value: The same object as the @factory argument. **/ CalFactory * -cal_factory_construct (CalFactory *factory, GNOME_Calendar_CalFactory corba_factory) +cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory) { g_return_val_if_fail (factory != NULL, NULL); g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL); @@ -409,20 +409,20 @@ cal_factory_construct (CalFactory *factory, GNOME_Calendar_CalFactory corba_fact * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of * failure. **/ -GNOME_Calendar_CalFactory +Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object) { - POA_GNOME_Calendar_CalFactory *servant; + POA_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_GNOME_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1); + servant = (POA_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1); servant->vepv = &cal_factory_vepv; CORBA_exception_init (&ev); - POA_GNOME_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev); + POA_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"); @@ -432,7 +432,7 @@ cal_factory_corba_object_create (BonoboObject *object) } CORBA_exception_free (&ev); - return (GNOME_Calendar_CalFactory) bonobo_object_activate_servant (object, servant); + return (Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant); } /** @@ -449,7 +449,7 @@ cal_factory_new (void) { CalFactory *factory; CORBA_Environment ev; - GNOME_Calendar_CalFactory corba_factory; + Evolution_Calendar_CalFactory corba_factory; gboolean retval; factory = gtk_type_new (CAL_FACTORY_TYPE); @@ -471,11 +471,11 @@ cal_factory_new (void) } void -cal_factory_load (CalFactory *factory, const char *uri, GNOME_Calendar_Listener listener) +cal_factory_load (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener) { LoadCreateJobData *jd; CORBA_Environment ev; - GNOME_Calendar_Listener listener_copy; + Evolution_Calendar_Listener listener_copy; gboolean result; CORBA_exception_init (&ev); @@ -511,7 +511,7 @@ cal_factory_load (CalFactory *factory, const char *uri, GNOME_Calendar_Listener } void -cal_factory_create (CalFactory *factory, const char *uri, GNOME_Calendar_Listener listener) +cal_factory_create (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener) { /* FIXME */ } diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h index 18f59d48b8..9d5fd57e2c 100644 --- a/calendar/pcs/cal-factory.h +++ b/calendar/pcs/cal-factory.h @@ -1,4 +1,4 @@ -/* GNOME calendar factory +/* Evolution calendar factory * * Copyright (C) 2000 Helix Code, Inc. * @@ -24,7 +24,7 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-object.h> -#include "gnome-calendar.h" +#include "evolution-calendar.h" BEGIN_GNOME_DECLS @@ -53,15 +53,15 @@ struct _CalFactoryClass { 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 (BonoboObject *object); +CalFactory *cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory); +Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object); CalFactory *cal_factory_new (void); -void cal_factory_load (CalFactory *factory, const char *uri, GNOME_Calendar_Listener listener); -void cal_factory_create (CalFactory *factory, const char *uri, GNOME_Calendar_Listener listener); +void cal_factory_load (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener); +void cal_factory_create (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener); -POA_GNOME_Calendar_CalFactory__epv *cal_factory_get_epv (void); +POA_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void); diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c index 2ddef9df37..eac02bb6d4 100644 --- a/calendar/pcs/cal.c +++ b/calendar/pcs/cal.c @@ -1,4 +1,4 @@ -/* GNOME calendar client interface object +/* Evolution calendar client interface object * * Copyright (C) 2000 Helix Code, Inc. * @@ -31,7 +31,7 @@ typedef struct { CalBackend *backend; /* Listener on the client we notify */ - GNOME_Calendar_Listener listener; + Evolution_Calendar_Listener listener; } CalPrivate; @@ -40,7 +40,7 @@ static void cal_class_init (CalClass *class); static void cal_init (Cal *cal); static void cal_destroy (GtkObject *object); -static POA_GNOME_Calendar_Cal__vepv cal_vepv; +static POA_Evolution_Calendar_Cal__vepv cal_vepv; static BonoboObjectClass *parent_class; @@ -83,7 +83,7 @@ static void init_cal_corba_class (void) { cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); - cal_vepv.GNOME_Calendar_Cal_epv = cal_get_epv (); + cal_vepv.Evolution_Calendar_Cal_epv = cal_get_epv (); } /* Class initialization function for the calendar */ @@ -175,12 +175,12 @@ Cal_get_uri (PortableServer_Servant servant, * * Return value: A newly-allocated EPV. **/ -POA_GNOME_Calendar_Cal__epv * +POA_Evolution_Calendar_Cal__epv * cal_get_epv (void) { - POA_GNOME_Calendar_Cal__epv *epv; + POA_Evolution_Calendar_Cal__epv *epv; - epv = g_new0 (POA_GNOME_Calendar_Cal__epv, 1); + epv = g_new0 (POA_Evolution_Calendar_Cal__epv, 1); epv->_get_uri = Cal_get_uri; return epv; @@ -203,9 +203,9 @@ cal_get_epv (void) **/ Cal * cal_construct (Cal *cal, - GNOME_Calendar_Cal corba_cal, + Evolution_Calendar_Cal corba_cal, CalBackend *backend, - GNOME_Calendar_Listener listener) + Evolution_Calendar_Listener listener) { CalPrivate *priv; CORBA_Environment ev; @@ -244,20 +244,20 @@ cal_construct (Cal *cal, * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of * failure. **/ -GNOME_Calendar_Cal +Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object) { - POA_GNOME_Calendar_Cal *servant; + POA_Evolution_Calendar_Cal *servant; CORBA_Environment ev; 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 (BonoboObjectServant, 1); + servant = (POA_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1); servant->vepv = &cal_vepv; CORBA_exception_init (&ev); - POA_GNOME_Calendar_Cal__init ((PortableServer_Servant) servant, &ev); + POA_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_message ("cal_corba_object_create(): could not init the servant"); g_free (servant); @@ -266,7 +266,7 @@ cal_corba_object_create (BonoboObject *object) } CORBA_exception_free (&ev); - return (GNOME_Calendar_Cal) bonobo_object_activate_servant (object, servant); + return (Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant); } /** @@ -281,10 +281,10 @@ cal_corba_object_create (BonoboObject *object) * if its corresponding CORBA object could not be created. **/ Cal * -cal_new (CalBackend *backend, GNOME_Calendar_Listener listener) +cal_new (CalBackend *backend, Evolution_Calendar_Listener listener) { Cal *cal, *retval; - GNOME_Calendar_Cal corba_cal; + Evolution_Calendar_Cal corba_cal; CORBA_Environment ev; gboolean ret; diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h index 9ac7abc06d..b866470437 100644 --- a/calendar/pcs/cal.h +++ b/calendar/pcs/cal.h @@ -1,4 +1,4 @@ -/* GNOME calendar client interface object +/* Evolution calendar client interface object * * Copyright (C) 2000 Helix Code, Inc. * @@ -24,7 +24,7 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-object.h> -#include "gnome-calendar.h" +#include "evolution-calendar.h" #include "cal-common.h" BEGIN_GNOME_DECLS @@ -51,14 +51,14 @@ struct _CalClass { GtkType cal_get_type (void); Cal *cal_construct (Cal *cal, - GNOME_Calendar_Cal corba_cal, + Evolution_Calendar_Cal corba_cal, CalBackend *backend, - GNOME_Calendar_Listener listener); -GNOME_Calendar_Cal cal_corba_object_create (BonoboObject *object); + Evolution_Calendar_Listener listener); +Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object); -Cal *cal_new (CalBackend *backend, GNOME_Calendar_Listener listener); +Cal *cal_new (CalBackend *backend, Evolution_Calendar_Listener listener); -POA_GNOME_Calendar_Cal__epv *cal_get_epv (void); +POA_Evolution_Calendar_Cal__epv *cal_get_epv (void); |