aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog13
-rw-r--r--calendar/Makefile.am16
-rw-r--r--calendar/cal-backend.c2
-rw-r--r--calendar/cal-backend.h4
-rw-r--r--calendar/cal-client.c14
-rw-r--r--calendar/cal-client.h2
-rw-r--r--calendar/cal-client/cal-client.c14
-rw-r--r--calendar/cal-client/cal-client.h2
-rw-r--r--calendar/cal-client/cal-listener.c46
-rw-r--r--calendar/cal-client/cal-listener.h22
-rw-r--r--calendar/cal-common.h2
-rw-r--r--calendar/cal-factory.c74
-rw-r--r--calendar/cal-factory.h14
-rw-r--r--calendar/cal-listener.c46
-rw-r--r--calendar/cal-listener.h22
-rw-r--r--calendar/cal.c32
-rw-r--r--calendar/cal.h14
-rw-r--r--calendar/evolution-calendar.idl10
-rw-r--r--calendar/gui/Makefile.am16
-rw-r--r--calendar/idl/evolution-calendar.idl10
-rw-r--r--calendar/pcs/cal-backend.c2
-rw-r--r--calendar/pcs/cal-backend.h4
-rw-r--r--calendar/pcs/cal-common.h2
-rw-r--r--calendar/pcs/cal-factory.c74
-rw-r--r--calendar/pcs/cal-factory.h14
-rw-r--r--calendar/pcs/cal.c32
-rw-r--r--calendar/pcs/cal.h14
27 files changed, 267 insertions, 250 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index af0471514f..47098393fc 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,16 @@
+2000-01-30 Federico Mena Quintero <federico@helixcode.com>
+
+ * evolution-calendar.idl: Changed the namespace from
+ GNOME::Calendar to Evolution::Calendar.
+ (Listener::LoadStatus): Fixed SUCESSS -> SUCCESS typo. And I
+ never noticed it in the implementation. Ain't M-/ grand?
+
+ * Makefile.am: Changed ocurrences of gnome-calendar.idl to
+ evolution-calendar.idl.
+
+ * *.[ch]: Changed GNOME_Calendar_foo identifiers to
+ Evolution_Calendar_foo.
+
2000-01-25 Federico Mena Quintero <federico@helixcode.com>
* cal-client.c cal-client.h: New files with the calendar client
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index fd7767ebcc..47f1328f02 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = doc
idldir = $(datadir)/idl
idl_DATA = \
GnomeCal.idl \
- gnome-calendar.idl
+ evolution-calendar.idl
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
@@ -109,14 +109,14 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
-GNOME_CALENDAR_CORBA_GENERATED = \
- gnome-calendar.h \
- gnome-calendar-common.c \
- gnome-calendar-skels.c \
- gnome-calendar-stubs.c
+GNOME_CALENDAR_CORBA_GENERATED = \
+ evolution-calendar.h \
+ evolution-calendar-common.c \
+ evolution-calendar-skels.c \
+ evolution-calendar-stubs.c
-$(GNOME_CALENDAR_CORBA_GENERATED): gnome-calendar.idl
- orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl $(srcdir)/gnome-calendar.idl
+$(GNOME_CALENDAR_CORBA_GENERATED): evolution-calendar.idl
+ orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl $(srcdir)/evolution-calendar.idl
tlacuache_SOURCES = \
$(GNOME_CALENDAR_CORBA_GENERATED) \
diff --git a/calendar/cal-backend.c b/calendar/cal-backend.c
index 6382d1f592..983edbb3cc 100644
--- a/calendar/cal-backend.c
+++ b/calendar/cal-backend.c
@@ -1,4 +1,4 @@
-/* GNOME calendar backend
+/* Evolution calendar backend
*
* Copyright (C) 2000 Helix Code, Inc.
*
diff --git a/calendar/cal-backend.h b/calendar/cal-backend.h
index d220943c00..31f726a68f 100644
--- a/calendar/cal-backend.h
+++ b/calendar/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/cal-client.c b/calendar/cal-client.c
index 91d83d2cad..bfb496528c 100644
--- a/calendar/cal-client.c
+++ b/calendar/cal-client.c
@@ -1,4 +1,4 @@
-/* GNOME calendar client
+/* Evolution calendar client
*
* Copyright (C) 2000 Helix Code, Inc.
*
@@ -38,7 +38,7 @@ typedef struct {
LoadState load_state;
/* The calendar factory we are contacting */
- GNOME_Calendar_CalFactory factory;
+ Evolution_Calendar_CalFactory factory;
/* Our calendar listener */
CalListener *listener;
@@ -168,7 +168,7 @@ CalClient *
cal_client_construct (CalClient *client)
{
CalClientPrivate *priv;
- GNOME_Calendar_CalFactory factory, factory_copy;
+ Evolution_Calendar_CalFactory factory, factory_copy;
CORBA_Environment ev;
int result;
@@ -177,7 +177,7 @@ cal_client_construct (CalClient *client)
priv = client->priv;
- factory = (GNOME_Calendar_CalFactory) goad_server_activate_with_id (
+ factory = (Evolution_Calendar_CalFactory) goad_server_activate_with_id (
NULL,
"calendar:cal-factory",
GOAD_ACTIVATE_REMOTE,
@@ -253,7 +253,7 @@ gboolean
cal_client_load_calendar (CalClient *client, const char *str_uri)
{
CalClientPrivate *priv;
- GNOME_Calendar_Listener corba_listener;
+ Evolution_Calendar_Listener corba_listener;
CORBA_Environment ev;
g_return_val_if_fail (client != NULL, FALSE);
@@ -270,12 +270,12 @@ cal_client_load_calendar (CalClient *client, const char *str_uri)
return FALSE;
}
- corba_listener = (GNOME_Calendar_Listener) bonobo_object_corba_objref (priv->listener);
+ corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (priv->listener);
CORBA_exception_init (&ev);
priv->load_state = LOAD_STATE_LOADING;
- GNOME_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
+ Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_load_calendar(): load request failed");
diff --git a/calendar/cal-client.h b/calendar/cal-client.h
index e5935d9076..95895f6079 100644
--- a/calendar/cal-client.h
+++ b/calendar/cal-client.h
@@ -1,4 +1,4 @@
-/* GNOME calendar client
+/* Evolution calendar client
*
* Copyright (C) 2000 Helix Code, Inc.
*
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 91d83d2cad..bfb496528c 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -1,4 +1,4 @@
-/* GNOME calendar client
+/* Evolution calendar client
*
* Copyright (C) 2000 Helix Code, Inc.
*
@@ -38,7 +38,7 @@ typedef struct {
LoadState load_state;
/* The calendar factory we are contacting */
- GNOME_Calendar_CalFactory factory;
+ Evolution_Calendar_CalFactory factory;
/* Our calendar listener */
CalListener *listener;
@@ -168,7 +168,7 @@ CalClient *
cal_client_construct (CalClient *client)
{
CalClientPrivate *priv;
- GNOME_Calendar_CalFactory factory, factory_copy;
+ Evolution_Calendar_CalFactory factory, factory_copy;
CORBA_Environment ev;
int result;
@@ -177,7 +177,7 @@ cal_client_construct (CalClient *client)
priv = client->priv;
- factory = (GNOME_Calendar_CalFactory) goad_server_activate_with_id (
+ factory = (Evolution_Calendar_CalFactory) goad_server_activate_with_id (
NULL,
"calendar:cal-factory",
GOAD_ACTIVATE_REMOTE,
@@ -253,7 +253,7 @@ gboolean
cal_client_load_calendar (CalClient *client, const char *str_uri)
{
CalClientPrivate *priv;
- GNOME_Calendar_Listener corba_listener;
+ Evolution_Calendar_Listener corba_listener;
CORBA_Environment ev;
g_return_val_if_fail (client != NULL, FALSE);
@@ -270,12 +270,12 @@ cal_client_load_calendar (CalClient *client, const char *str_uri)
return FALSE;
}
- corba_listener = (GNOME_Calendar_Listener) bonobo_object_corba_objref (priv->listener);
+ corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (priv->listener);
CORBA_exception_init (&ev);
priv->load_state = LOAD_STATE_LOADING;
- GNOME_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
+ Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_load_calendar(): load request failed");
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
index e5935d9076..95895f6079 100644
--- a/calendar/cal-client/cal-client.h
+++ b/calendar/cal-client/cal-client.h
@@ -1,4 +1,4 @@
-/* GNOME calendar client
+/* Evolution calendar client
*
* Copyright (C) 2000 Helix Code, Inc.
*
diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
index a5a37a12d9..b1f91e8d8f 100644
--- a/calendar/cal-client/cal-listener.c
+++ b/calendar/cal-client/cal-listener.c
@@ -1,4 +1,4 @@
-/* GNOME calendar listener
+/* Evolution calendar listener
*
* Copyright (C) 2000 Helix Code, Inc.
*
@@ -27,7 +27,7 @@
/* Private part of the CalListener structure */
typedef struct {
/* The calendar this listener refers to */
- GNOME_Calendar_Cal cal;
+ Evolution_Calendar_Cal cal;
} CalListenerPrivate;
@@ -47,7 +47,7 @@ static void cal_listener_destroy (GtkObject *object);
static void marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args);
-static POA_GNOME_Calendar_Listener__vepv cal_listener_vepv;
+static POA_Evolution_Calendar_Listener__vepv cal_listener_vepv;
static guint cal_listener_signals[LAST_SIGNAL];
@@ -92,7 +92,7 @@ static void
init_cal_listener_corba_class (void)
{
cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- cal_listener_vepv.GNOME_Calendar_Listener_epv = cal_listener_get_epv ();
+ cal_listener_vepv.Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
}
/* Class initialization function for the calendar listener */
@@ -217,14 +217,14 @@ marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg
/* Listener::cal_loaded method */
static void
Listener_cal_loaded (PortableServer_Servant servant,
- GNOME_Calendar_Listener_LoadStatus status,
- GNOME_Calendar_Cal cal,
+ Evolution_Calendar_Listener_LoadStatus status,
+ Evolution_Calendar_Cal cal,
CORBA_Environment *ev)
{
CalListener *listener;
CalListenerPrivate *priv;
CORBA_Environment aev;
- GNOME_Calendar_Cal cal_copy;
+ Evolution_Calendar_Cal cal_copy;
CalListenerLoadStatus load_status;
listener = CAL_LISTENER (bonobo_object_from_servant (servant));
@@ -248,11 +248,11 @@ Listener_cal_loaded (PortableServer_Servant servant,
priv->cal = cal_copy;
switch (status) {
- GNOME_Calendar_Listener_SUCESSS:
+ Evolution_Calendar_Listener_SUCESSS:
load_status = CAL_LISTENER_LOAD_SUCCESS;
break;
- GNOME_Calendar_Listener_ERROR:
+ Evolution_Calendar_Listener_ERROR:
load_status = CAL_LISTENER_LOAD_ERROR;
break;
@@ -268,7 +268,7 @@ Listener_cal_loaded (PortableServer_Servant servant,
/* Listener::obj_added method */
static void
Listener_obj_added (PortableServer_Servant servant,
- GNOME_Calendar_CalObj calobj,
+ Evolution_Calendar_CalObj calobj,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -281,7 +281,7 @@ Listener_obj_added (PortableServer_Servant servant,
/* Listener::obj_removed method */
static void
Listener_obj_removed (PortableServer_Servant servant,
- GNOME_Calendar_CalObjUID uid,
+ Evolution_Calendar_CalObjUID uid,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -294,7 +294,7 @@ Listener_obj_removed (PortableServer_Servant servant,
/* Listener::obj_changed method */
static void
Listener_obj_changed (PortableServer_Servant servant,
- GNOME_Calendar_CalObj calobj,
+ Evolution_Calendar_CalObj calobj,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -312,12 +312,12 @@ Listener_obj_changed (PortableServer_Servant servant,
*
* Return value: A newly-allocated EPV.
**/
-POA_GNOME_Calendar_Listener__epv *
+POA_Evolution_Calendar_Listener__epv *
cal_listener_get_epv (void)
{
- POA_GNOME_Calendar_Listener__epv *epv;
+ POA_Evolution_Calendar_Listener__epv *epv;
- epv = g_new0 (POA_GNOME_Calendar_Listener__epv, 1);
+ epv = g_new0 (POA_Evolution_Calendar_Listener__epv, 1);
epv->cal_loaded = Listener_cal_loaded;
epv->obj_added = Listener_obj_added;
epv->obj_removed = Listener_obj_removed;
@@ -339,7 +339,7 @@ cal_listener_get_epv (void)
* Return value: the same object as the @listener argument.
**/
CalListener *
-cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_listener)
+cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba_listener)
{
g_return_val_if_fail (listener != NULL, NULL);
g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
@@ -358,20 +358,20 @@ cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_lis
* Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
* failure.
**/
-GNOME_Calendar_Listener
+Evolution_Calendar_Listener
cal_listener_corba_object_create (BonoboObject *object)
{
- POA_GNOME_Calendar_Listener *servant;
+ POA_Evolution_Calendar_Listener *servant;
CORBA_Environment ev;
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 (BonoboObjectServant, 1);
+ servant = (POA_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &cal_listener_vepv;
CORBA_exception_init (&ev);
- POA_GNOME_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
+ POA_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -379,7 +379,7 @@ cal_listener_corba_object_create (BonoboObject *object)
}
CORBA_exception_free (&ev);
- return (GNOME_Calendar_Listener) bonobo_object_activate_servant (object, servant);
+ return (Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
}
/**
@@ -396,7 +396,7 @@ cal_listener_new (void)
{
CalListener *listener;
CORBA_Environment ev;
- GNOME_Calendar_Listener corba_listener;
+ Evolution_Calendar_Listener corba_listener;
gboolean result;
listener = gtk_type_new (CAL_LISTENER_TYPE);
@@ -425,7 +425,7 @@ cal_listener_new (void)
*
* Return value: The calendar that the listener is watching.
**/
-GNOME_Calendar_Cal
+Evolution_Calendar_Cal
cal_listener_get_calendar (CalListener *listener)
{
CalListenerPrivate *priv;
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
index 22853212ee..e339e3e3ed 100644
--- a/calendar/cal-client/cal-listener.h
+++ b/calendar/cal-client/cal-listener.h
@@ -1,4 +1,4 @@
-/* GNOME calendar listener
+/* Evolution calendar listener
*
* 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
@@ -58,22 +58,24 @@ struct _CalListenerClass {
void (* cal_loaded) (CalListener *listener,
CalListenerLoadStatus status,
- GNOME_Calendar_Cal cal);
- void (* obj_added) (CalListener *listener, GNOME_Calendar_CalObj calobj);
- void (* obj_removed) (CalListener *listener, GNOME_Calendar_CalObjUID uid);
- void (* obj_changed) (CalListener *listener, GNOME_Calendar_CalObj calobj);
+ Evolution_Calendar_Cal cal);
+ void (* obj_added) (CalListener *listener, Evolution_Calendar_CalObj calobj);
+ void (* obj_removed) (CalListener *listener, Evolution_Calendar_CalObjUID uid);
+ void (* obj_changed) (CalListener *listener, Evolution_Calendar_CalObj calobj);
};
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 (BonoboObject *object);
+CalListener *cal_listener_construct (CalListener *listener,
+ Evolution_Calendar_Listener corba_listener);
+
+Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
CalListener *cal_listener_new (void);
-GNOME_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
+Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
-POA_GNOME_Calendar_Listener__epv *cal_listener_get_epv (void);
+POA_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
diff --git a/calendar/cal-common.h b/calendar/cal-common.h
index 4177dbb096..e51ddf1bdd 100644
--- a/calendar/cal-common.h
+++ b/calendar/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/cal-factory.c b/calendar/cal-factory.c
index 022fb183f1..f544964612 100644
--- a/calendar/cal-factory.c
+++ b/calendar/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/cal-factory.h b/calendar/cal-factory.h
index 18f59d48b8..9d5fd57e2c 100644
--- a/calendar/cal-factory.h
+++ b/calendar/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/cal-listener.c b/calendar/cal-listener.c
index a5a37a12d9..b1f91e8d8f 100644
--- a/calendar/cal-listener.c
+++ b/calendar/cal-listener.c
@@ -1,4 +1,4 @@
-/* GNOME calendar listener
+/* Evolution calendar listener
*
* Copyright (C) 2000 Helix Code, Inc.
*
@@ -27,7 +27,7 @@
/* Private part of the CalListener structure */
typedef struct {
/* The calendar this listener refers to */
- GNOME_Calendar_Cal cal;
+ Evolution_Calendar_Cal cal;
} CalListenerPrivate;
@@ -47,7 +47,7 @@ static void cal_listener_destroy (GtkObject *object);
static void marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args);
-static POA_GNOME_Calendar_Listener__vepv cal_listener_vepv;
+static POA_Evolution_Calendar_Listener__vepv cal_listener_vepv;
static guint cal_listener_signals[LAST_SIGNAL];
@@ -92,7 +92,7 @@ static void
init_cal_listener_corba_class (void)
{
cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- cal_listener_vepv.GNOME_Calendar_Listener_epv = cal_listener_get_epv ();
+ cal_listener_vepv.Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
}
/* Class initialization function for the calendar listener */
@@ -217,14 +217,14 @@ marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg
/* Listener::cal_loaded method */
static void
Listener_cal_loaded (PortableServer_Servant servant,
- GNOME_Calendar_Listener_LoadStatus status,
- GNOME_Calendar_Cal cal,
+ Evolution_Calendar_Listener_LoadStatus status,
+ Evolution_Calendar_Cal cal,
CORBA_Environment *ev)
{
CalListener *listener;
CalListenerPrivate *priv;
CORBA_Environment aev;
- GNOME_Calendar_Cal cal_copy;
+ Evolution_Calendar_Cal cal_copy;
CalListenerLoadStatus load_status;
listener = CAL_LISTENER (bonobo_object_from_servant (servant));
@@ -248,11 +248,11 @@ Listener_cal_loaded (PortableServer_Servant servant,
priv->cal = cal_copy;
switch (status) {
- GNOME_Calendar_Listener_SUCESSS:
+ Evolution_Calendar_Listener_SUCESSS:
load_status = CAL_LISTENER_LOAD_SUCCESS;
break;
- GNOME_Calendar_Listener_ERROR:
+ Evolution_Calendar_Listener_ERROR:
load_status = CAL_LISTENER_LOAD_ERROR;
break;
@@ -268,7 +268,7 @@ Listener_cal_loaded (PortableServer_Servant servant,
/* Listener::obj_added method */
static void
Listener_obj_added (PortableServer_Servant servant,
- GNOME_Calendar_CalObj calobj,
+ Evolution_Calendar_CalObj calobj,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -281,7 +281,7 @@ Listener_obj_added (PortableServer_Servant servant,
/* Listener::obj_removed method */
static void
Listener_obj_removed (PortableServer_Servant servant,
- GNOME_Calendar_CalObjUID uid,
+ Evolution_Calendar_CalObjUID uid,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -294,7 +294,7 @@ Listener_obj_removed (PortableServer_Servant servant,
/* Listener::obj_changed method */
static void
Listener_obj_changed (PortableServer_Servant servant,
- GNOME_Calendar_CalObj calobj,
+ Evolution_Calendar_CalObj calobj,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -312,12 +312,12 @@ Listener_obj_changed (PortableServer_Servant servant,
*
* Return value: A newly-allocated EPV.
**/
-POA_GNOME_Calendar_Listener__epv *
+POA_Evolution_Calendar_Listener__epv *
cal_listener_get_epv (void)
{
- POA_GNOME_Calendar_Listener__epv *epv;
+ POA_Evolution_Calendar_Listener__epv *epv;
- epv = g_new0 (POA_GNOME_Calendar_Listener__epv, 1);
+ epv = g_new0 (POA_Evolution_Calendar_Listener__epv, 1);
epv->cal_loaded = Listener_cal_loaded;
epv->obj_added = Listener_obj_added;
epv->obj_removed = Listener_obj_removed;
@@ -339,7 +339,7 @@ cal_listener_get_epv (void)
* Return value: the same object as the @listener argument.
**/
CalListener *
-cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_listener)
+cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba_listener)
{
g_return_val_if_fail (listener != NULL, NULL);
g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
@@ -358,20 +358,20 @@ cal_listener_construct (CalListener *listener, GNOME_Calendar_Listener corba_lis
* Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
* failure.
**/
-GNOME_Calendar_Listener
+Evolution_Calendar_Listener
cal_listener_corba_object_create (BonoboObject *object)
{
- POA_GNOME_Calendar_Listener *servant;
+ POA_Evolution_Calendar_Listener *servant;
CORBA_Environment ev;
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 (BonoboObjectServant, 1);
+ servant = (POA_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &cal_listener_vepv;
CORBA_exception_init (&ev);
- POA_GNOME_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
+ POA_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -379,7 +379,7 @@ cal_listener_corba_object_create (BonoboObject *object)
}
CORBA_exception_free (&ev);
- return (GNOME_Calendar_Listener) bonobo_object_activate_servant (object, servant);
+ return (Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
}
/**
@@ -396,7 +396,7 @@ cal_listener_new (void)
{
CalListener *listener;
CORBA_Environment ev;
- GNOME_Calendar_Listener corba_listener;
+ Evolution_Calendar_Listener corba_listener;
gboolean result;
listener = gtk_type_new (CAL_LISTENER_TYPE);
@@ -425,7 +425,7 @@ cal_listener_new (void)
*
* Return value: The calendar that the listener is watching.
**/
-GNOME_Calendar_Cal
+Evolution_Calendar_Cal
cal_listener_get_calendar (CalListener *listener)
{
CalListenerPrivate *priv;
diff --git a/calendar/cal-listener.h b/calendar/cal-listener.h
index 22853212ee..e339e3e3ed 100644
--- a/calendar/cal-listener.h
+++ b/calendar/cal-listener.h
@@ -1,4 +1,4 @@
-/* GNOME calendar listener
+/* Evolution calendar listener
*
* 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
@@ -58,22 +58,24 @@ struct _CalListenerClass {
void (* cal_loaded) (CalListener *listener,
CalListenerLoadStatus status,
- GNOME_Calendar_Cal cal);
- void (* obj_added) (CalListener *listener, GNOME_Calendar_CalObj calobj);
- void (* obj_removed) (CalListener *listener, GNOME_Calendar_CalObjUID uid);
- void (* obj_changed) (CalListener *listener, GNOME_Calendar_CalObj calobj);
+ Evolution_Calendar_Cal cal);
+ void (* obj_added) (CalListener *listener, Evolution_Calendar_CalObj calobj);
+ void (* obj_removed) (CalListener *listener, Evolution_Calendar_CalObjUID uid);
+ void (* obj_changed) (CalListener *listener, Evolution_Calendar_CalObj calobj);
};
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 (BonoboObject *object);
+CalListener *cal_listener_construct (CalListener *listener,
+ Evolution_Calendar_Listener corba_listener);
+
+Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
CalListener *cal_listener_new (void);
-GNOME_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
+Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
-POA_GNOME_Calendar_Listener__epv *cal_listener_get_epv (void);
+POA_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
diff --git a/calendar/cal.c b/calendar/cal.c
index 2ddef9df37..eac02bb6d4 100644
--- a/calendar/cal.c
+++ b/calendar/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/cal.h b/calendar/cal.h
index 9ac7abc06d..b866470437 100644
--- a/calendar/cal.h
+++ b/calendar/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);
diff --git a/calendar/evolution-calendar.idl b/calendar/evolution-calendar.idl
index 4fc6edd9b2..2be11abe1f 100644
--- a/calendar/evolution-calendar.idl
+++ b/calendar/evolution-calendar.idl
@@ -1,4 +1,4 @@
-/* GNOME calendar interfaces
+/* Evolution calendar interface
*
* Copyright (C) 2000 Eskil Heyn Olsen
* Copyright (C) 2000 Helix Code, Inc.
@@ -7,12 +7,12 @@
* Federico Mena-Quintero <federico@helixcode.com>
*/
-#ifndef _GNOME_CALENDAR_IDL_
-#define _GNOME_CALENDAR_IDL_
+#ifndef _EVOLUTION_CALENDAR_IDL_
+#define _EVOLUTION_CALENDAR_IDL_
#include <Bonobo.idl>
-module GNOME {
+module Evolution {
module Calendar {
/* A calendar object (event/todo/journal/etc), represented as an
@@ -35,7 +35,7 @@ module Calendar {
interface Listener : Bonobo::Unknown {
/* Return status when loading a calendar; we need better error reporting */
enum LoadStatus {
- SUCESSS,
+ SUCCESS,
ERROR
};
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index fd7767ebcc..47f1328f02 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = doc
idldir = $(datadir)/idl
idl_DATA = \
GnomeCal.idl \
- gnome-calendar.idl
+ evolution-calendar.idl
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
@@ -109,14 +109,14 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
-GNOME_CALENDAR_CORBA_GENERATED = \
- gnome-calendar.h \
- gnome-calendar-common.c \
- gnome-calendar-skels.c \
- gnome-calendar-stubs.c
+GNOME_CALENDAR_CORBA_GENERATED = \
+ evolution-calendar.h \
+ evolution-calendar-common.c \
+ evolution-calendar-skels.c \
+ evolution-calendar-stubs.c
-$(GNOME_CALENDAR_CORBA_GENERATED): gnome-calendar.idl
- orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl $(srcdir)/gnome-calendar.idl
+$(GNOME_CALENDAR_CORBA_GENERATED): evolution-calendar.idl
+ orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl $(srcdir)/evolution-calendar.idl
tlacuache_SOURCES = \
$(GNOME_CALENDAR_CORBA_GENERATED) \
diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl
index 4fc6edd9b2..2be11abe1f 100644
--- a/calendar/idl/evolution-calendar.idl
+++ b/calendar/idl/evolution-calendar.idl
@@ -1,4 +1,4 @@
-/* GNOME calendar interfaces
+/* Evolution calendar interface
*
* Copyright (C) 2000 Eskil Heyn Olsen
* Copyright (C) 2000 Helix Code, Inc.
@@ -7,12 +7,12 @@
* Federico Mena-Quintero <federico@helixcode.com>
*/
-#ifndef _GNOME_CALENDAR_IDL_
-#define _GNOME_CALENDAR_IDL_
+#ifndef _EVOLUTION_CALENDAR_IDL_
+#define _EVOLUTION_CALENDAR_IDL_
#include <Bonobo.idl>
-module GNOME {
+module Evolution {
module Calendar {
/* A calendar object (event/todo/journal/etc), represented as an
@@ -35,7 +35,7 @@ module Calendar {
interface Listener : Bonobo::Unknown {
/* Return status when loading a calendar; we need better error reporting */
enum LoadStatus {
- SUCESSS,
+ SUCCESS,
ERROR
};
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);
generated by cgit (git 2.34.1) at 2024-11-06 06:07:09 +0800