aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/cal-client/cal-client.c96
-rw-r--r--calendar/cal-client/cal-listener.c44
-rw-r--r--calendar/cal-client/cal-listener.h16
-rw-r--r--calendar/gui/Evolution-Composer.h573
-rw-r--r--calendar/gui/Makefile.am4
-rw-r--r--calendar/gui/e-itip-control.c26
-rw-r--r--calendar/gui/e-meeting-edit.c20
-rw-r--r--calendar/idl/evolution-calendar.idl41
-rw-r--r--calendar/pcs/Makefile.am2
-rw-r--r--calendar/pcs/cal-factory.c80
-rw-r--r--calendar/pcs/cal-factory.h6
-rw-r--r--calendar/pcs/cal.c160
-rw-r--r--calendar/pcs/cal.h10
14 files changed, 539 insertions, 545 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 91a3b049ed..182c1c9a90 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-10 Michael Meeks <michael@helixcode.com>
+
+ * gui/Makefile.am ($(IDL_GENERATED)): sort include order.
+
+ * pcs/Makefile.am (idl_flags): ditto.
+
2000-11-10 JP Rosevear <jpr@helixcode.com>
* conduits/calendar/calendar-conduit.c (for_each_modified): Inc the
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 3e7daf80c4..39d59defe2 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -43,13 +43,13 @@ struct _CalClientPrivate {
LoadState load_state;
/* The calendar factory we are contacting */
- Evolution_Calendar_CalFactory factory;
+ GNOME_Evolution_Calendar_CalFactory factory;
/* Our calendar listener */
CalListener *listener;
/* The calendar client interface object we are contacting */
- Evolution_Calendar_Cal cal;
+ GNOME_Evolution_Calendar_Cal cal;
};
@@ -229,7 +229,7 @@ destroy_cal (CalClient *client)
return;
CORBA_exception_init (&ev);
- Evolution_Calendar_Cal_unref (priv->cal, &ev);
+ GNOME_Evolution_Calendar_Cal_unref (priv->cal, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
g_message ("destroy_cal(): could not unref the calendar client interface object");
@@ -278,14 +278,14 @@ cal_client_destroy (GtkObject *object)
/* Handle the cal_loaded signal from the listener */
static void
cal_loaded_cb (CalListener *listener,
- Evolution_Calendar_Listener_LoadStatus status,
- Evolution_Calendar_Cal cal,
+ GNOME_Evolution_Calendar_Listener_LoadStatus status,
+ GNOME_Evolution_Calendar_Cal cal,
gpointer data)
{
CalClient *client;
CalClientPrivate *priv;
CORBA_Environment ev;
- Evolution_Calendar_Cal cal_copy;
+ GNOME_Evolution_Calendar_Cal cal_copy;
CalClientLoadStatus client_status;
client = CAL_CLIENT (data);
@@ -296,7 +296,7 @@ cal_loaded_cb (CalListener *listener,
client_status = CAL_CLIENT_LOAD_ERROR;
switch (status) {
- case Evolution_Calendar_Listener_SUCCESS:
+ case GNOME_Evolution_Calendar_Listener_SUCCESS:
CORBA_exception_init (&ev);
cal_copy = CORBA_Object_duplicate (cal, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -312,15 +312,15 @@ cal_loaded_cb (CalListener *listener,
client_status = CAL_CLIENT_LOAD_SUCCESS;
goto out;
- case Evolution_Calendar_Listener_ERROR:
+ case GNOME_Evolution_Calendar_Listener_ERROR:
client_status = CAL_CLIENT_LOAD_ERROR;
goto error;
- case Evolution_Calendar_Listener_IN_USE:
+ case GNOME_Evolution_Calendar_Listener_IN_USE:
client_status = CAL_CLIENT_LOAD_IN_USE;
goto error;
- case Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
+ case GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
client_status = CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED;
goto error;
@@ -344,7 +344,7 @@ cal_loaded_cb (CalListener *listener,
/* Handle the obj_updated signal from the listener */
static void
-obj_updated_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
+obj_updated_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)
{
CalClient *client;
@@ -354,7 +354,7 @@ obj_updated_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, g
/* Handle the obj_removed signal from the listener */
static void
-obj_removed_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
+obj_removed_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)
{
CalClient *client;
@@ -378,7 +378,7 @@ CalClient *
cal_client_construct (CalClient *client)
{
CalClientPrivate *priv;
- Evolution_Calendar_CalFactory factory, factory_copy;
+ GNOME_Evolution_Calendar_CalFactory factory, factory_copy;
CORBA_Environment ev;
int result;
@@ -388,7 +388,7 @@ cal_client_construct (CalClient *client)
priv = client->priv;
- factory = (Evolution_Calendar_CalFactory) oaf_activate_from_id (
+ factory = (GNOME_Evolution_Calendar_CalFactory) oaf_activate_from_id (
"OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",
OAF_FLAG_NO_LOCAL, NULL, &ev);
@@ -450,7 +450,7 @@ static gboolean
load_or_create (CalClient *client, const char *str_uri, gboolean load)
{
CalClientPrivate *priv;
- Evolution_Calendar_Listener corba_listener;
+ GNOME_Evolution_Calendar_Listener corba_listener;
CORBA_Environment ev;
g_return_val_if_fail (client != NULL, FALSE);
@@ -477,7 +477,7 @@ load_or_create (CalClient *client, const char *str_uri, gboolean load)
GTK_SIGNAL_FUNC (obj_removed_cb),
client);
- corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (
+ corba_listener = (GNOME_Evolution_Calendar_Listener) bonobo_object_corba_objref (
BONOBO_OBJECT (priv->listener));
CORBA_exception_init (&ev);
@@ -485,9 +485,9 @@ load_or_create (CalClient *client, const char *str_uri, gboolean load)
priv->load_state = LOAD_STATE_LOADING;
if (load)
- Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
+ GNOME_Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
else
- Evolution_Calendar_CalFactory_create (priv->factory, str_uri, corba_listener, &ev);
+ GNOME_Evolution_Calendar_CalFactory_create (priv->factory, str_uri, corba_listener, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("load_or_create(): load/create request failed");
@@ -558,12 +558,12 @@ cal_client_is_loaded (CalClient *client)
}
/* Converts our representation of a calendar component type into its CORBA representation */
-static Evolution_Calendar_CalObjType
+static GNOME_Evolution_Calendar_CalObjType
corba_obj_type (CalObjType type)
{
- return (((type & CALOBJ_TYPE_EVENT) ? Evolution_Calendar_TYPE_EVENT : 0)
- | ((type & CALOBJ_TYPE_TODO) ? Evolution_Calendar_TYPE_TODO : 0)
- | ((type & CALOBJ_TYPE_JOURNAL) ? Evolution_Calendar_TYPE_JOURNAL : 0));
+ return (((type & CALOBJ_TYPE_EVENT) ? GNOME_Evolution_Calendar_TYPE_EVENT : 0)
+ | ((type & CALOBJ_TYPE_TODO) ? GNOME_Evolution_Calendar_TYPE_TODO : 0)
+ | ((type & CALOBJ_TYPE_JOURNAL) ? GNOME_Evolution_Calendar_TYPE_JOURNAL : 0));
}
/**
@@ -593,7 +593,7 @@ cal_client_get_n_objects (CalClient *client, CalObjType type)
t = corba_obj_type (type);
CORBA_exception_init (&ev);
- n = Evolution_Calendar_Cal_get_n_objects (priv->cal, t, &ev);
+ n = GNOME_Evolution_Calendar_Cal_countObjects (priv->cal, t, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_get_n_objects(): could not get the number of objects");
@@ -621,7 +621,7 @@ cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
{
CalClientPrivate *priv;
CORBA_Environment ev;
- Evolution_Calendar_CalObj calobj_str;
+ GNOME_Evolution_Calendar_CalObj calobj_str;
CalClientGetStatus retval;
icalcomponent *icalcomp;
@@ -638,10 +638,10 @@ cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
*comp = NULL;
CORBA_exception_init (&ev);
- calobj_str = Evolution_Calendar_Cal_get_object (priv->cal, (char *) uid, &ev);
+ calobj_str = GNOME_Evolution_Calendar_Cal_getObject (priv->cal, (char *) uid, &ev);
if (ev._major == CORBA_USER_EXCEPTION
- && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
+ && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
goto out;
else if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_get_object(): could not get the object");
@@ -676,7 +676,7 @@ cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
/* Builds an UID list out of a CORBA UID sequence */
static GList *
-build_uid_list (Evolution_Calendar_CalObjUIDSeq *seq)
+build_uid_list (GNOME_Evolution_Calendar_CalObjUIDSeq *seq)
{
GList *uids;
int i;
@@ -704,7 +704,7 @@ cal_client_get_uids (CalClient *client, CalObjType type)
{
CalClientPrivate *priv;
CORBA_Environment ev;
- Evolution_Calendar_CalObjUIDSeq *seq;
+ GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
int t;
GList *uids;
@@ -718,7 +718,7 @@ cal_client_get_uids (CalClient *client, CalObjType type)
CORBA_exception_init (&ev);
- seq = Evolution_Calendar_Cal_get_uids (priv->cal, t, &ev);
+ seq = GNOME_Evolution_Calendar_Cal_getUIds (priv->cal, t, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_get_uids(): could not get the list of UIDs");
CORBA_exception_free (&ev);
@@ -735,7 +735,7 @@ cal_client_get_uids (CalClient *client, CalObjType type)
/* Builds a GList of CalObjChange structures from the CORBA sequence */
static GList *
-build_change_list (Evolution_Calendar_CalObjChangeSeq *seq)
+build_change_list (GNOME_Evolution_Calendar_CalObjChangeSeq *seq)
{
GList *list;
int i;
@@ -743,7 +743,7 @@ build_change_list (Evolution_Calendar_CalObjChangeSeq *seq)
/* Create the list in reverse order */
list = NULL;
for (i = 0; i < seq->_length; i++) {
- Evolution_Calendar_CalObjChange *corba_coc;
+ GNOME_Evolution_Calendar_CalObjChange *corba_coc;
CalObjChange *coc;
corba_coc = &seq->_buffer[i];
@@ -774,7 +774,7 @@ cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
{
CalClientPrivate *priv;
CORBA_Environment ev;
- Evolution_Calendar_CalObjChangeSeq *seq;
+ GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
int t;
GList *changes;
@@ -787,7 +787,7 @@ cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
t = corba_obj_type (type);
CORBA_exception_init (&ev);
- seq = Evolution_Calendar_Cal_get_changed_uids (priv->cal, t, since, &ev);
+ seq = GNOME_Evolution_Calendar_Cal_getChangedUIds (priv->cal, t, since, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_get_changed_uids(): could not get the list of changes");
CORBA_exception_free (&ev);
@@ -806,7 +806,7 @@ cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
#if 0
/* Builds a GList of CalObjInstance structures from the CORBA sequence */
static GList *
-build_object_instance_list (Evolution_Calendar_CalObjInstanceSeq *seq)
+build_object_instance_list (GNOME_Evolution_Calendar_CalObjInstanceSeq *seq)
{
GList *list;
int i;
@@ -815,7 +815,7 @@ build_object_instance_list (Evolution_Calendar_CalObjInstanceSeq *seq)
list = NULL;
for (i = 0; i < seq->_length; i++) {
- Evolution_Calendar_CalObjInstance *corba_icoi;
+ GNOME_Evolution_Calendar_CalObjInstance *corba_icoi;
CalObjInstance *icoi;
corba_icoi = &seq->_buffer[i];
@@ -851,7 +851,7 @@ cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t star
{
CalClientPrivate *priv;
CORBA_Environment ev;
- Evolution_Calendar_CalObjUIDSeq *seq;
+ GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
GList *uids;
int t;
@@ -868,7 +868,7 @@ cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t star
t = corba_obj_type (type);
- seq = Evolution_Calendar_Cal_get_objects_in_range (priv->cal, t, start, end, &ev);
+ seq = GNOME_Evolution_Calendar_Cal_getObjectsInRange (priv->cal, t, start, end, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_get_objects_in_range(): could not get the objects");
CORBA_exception_free (&ev);
@@ -1186,7 +1186,7 @@ uncorba_alarm_type (Evolution_Calendar_AlarmType corba_type)
/* Builds a GList of CalAlarmInstance structures from the CORBA sequence */
static GList *
-build_alarm_instance_list (Evolution_Calendar_CalAlarmInstanceSeq *seq)
+build_alarm_instance_list (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq)
{
GList *list;
int i;
@@ -1195,7 +1195,7 @@ build_alarm_instance_list (Evolution_Calendar_CalAlarmInstanceSeq *seq)
list = NULL;
for (i = 0; i < seq->_length; i++) {
- Evolution_Calendar_CalAlarmInstance *corba_ai;
+ GNOME_Evolution_Calendar_CalAlarmInstance *corba_ai;
CalAlarmInstance *ai;
corba_ai = &seq->_buffer[i];
@@ -1231,7 +1231,7 @@ cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
{
CalClientPrivate *priv;
CORBA_Environment ev;
- Evolution_Calendar_CalAlarmInstanceSeq *seq;
+ GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
GList *alarms;
g_return_val_if_fail (client != NULL, NULL);
@@ -1245,7 +1245,7 @@ cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
CORBA_exception_init (&ev);
- seq = Evolution_Calendar_Cal_get_alarms_in_range (priv->cal, start, end, &ev);
+ seq = GNOME_Evolution_Calendar_Cal_getAlarmsInRange (priv->cal, start, end, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_get_alarms_in_range(): could not get the alarm range");
CORBA_exception_free (&ev);
@@ -1279,7 +1279,7 @@ cal_client_get_alarms_for_object (CalClient *client, const char *uid,
{
CalClientPrivate *priv;
CORBA_Environment ev;
- Evolution_Calendar_CalAlarmInstanceSeq *seq;
+ GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
gboolean retval;
g_return_val_if_fail (client != NULL, FALSE);
@@ -1298,9 +1298,9 @@ cal_client_get_alarms_for_object (CalClient *client, const char *uid,
CORBA_exception_init (&ev);
- seq = Evolution_Calendar_Cal_get_alarms_for_object (priv->cal, (char *) uid, start, end, &ev);
+ seq = GNOME_Evolution_Calendar_Cal_getAlarmsForObject (priv->cal, (char *) uid, start, end, &ev);
if (ev._major == CORBA_USER_EXCEPTION
- && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
+ && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
goto out;
else if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");
@@ -1354,11 +1354,11 @@ cal_client_update_object (CalClient *client, CalComponent *comp)
cal_component_get_uid (comp, &uid);
CORBA_exception_init (&ev);
- Evolution_Calendar_Cal_update_object (priv->cal, (char *) uid, obj_string, &ev);
+ GNOME_Evolution_Calendar_Cal_updateObject (priv->cal, (char *) uid, obj_string, &ev);
g_free (obj_string);
if (ev._major == CORBA_USER_EXCEPTION &&
- strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_InvalidObject) == 0)
+ strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_InvalidObject) == 0)
goto out;
else if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_update_object(): could not update the object");
@@ -1390,10 +1390,10 @@ cal_client_remove_object (CalClient *client, const char *uid)
retval = FALSE;
CORBA_exception_init (&ev);
- Evolution_Calendar_Cal_remove_object (priv->cal, (char *) uid, &ev);
+ GNOME_Evolution_Calendar_Cal_removeObject (priv->cal, (char *) uid, &ev);
if (ev._major == CORBA_USER_EXCEPTION &&
- strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
+ strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
goto out;
else if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_remove_object(): could not remove the object");
diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
index c5626fee9d..cf7442b0e9 100644
--- a/calendar/cal-client/cal-listener.c
+++ b/calendar/cal-client/cal-listener.c
@@ -28,7 +28,7 @@
/* Private part of the CalListener structure */
struct _CalListenerPrivate {
/* The calendar this listener refers to */
- Evolution_Calendar_Cal cal;
+ GNOME_Evolution_Calendar_Cal cal;
};
@@ -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_Evolution_Calendar_Listener__vepv cal_listener_vepv;
+static POA_GNOME_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.Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
+ cal_listener_vepv.GNOME_Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
}
/* Class initialization function for the calendar listener */
@@ -212,14 +212,14 @@ marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg
/* Listener::cal_loaded method */
static void
Listener_cal_loaded (PortableServer_Servant servant,
- Evolution_Calendar_Listener_LoadStatus status,
- Evolution_Calendar_Cal cal,
+ GNOME_Evolution_Calendar_Listener_LoadStatus status,
+ GNOME_Evolution_Calendar_Cal cal,
CORBA_Environment *ev)
{
CalListener *listener;
CalListenerPrivate *priv;
CORBA_Environment aev;
- Evolution_Calendar_Cal cal_copy;
+ GNOME_Evolution_Calendar_Cal cal_copy;
listener = CAL_LISTENER (bonobo_object_from_servant (servant));
priv = listener->priv;
@@ -248,7 +248,7 @@ Listener_cal_loaded (PortableServer_Servant servant,
/* Listener::obj_updated method */
static void
Listener_obj_updated (PortableServer_Servant servant,
- Evolution_Calendar_CalObjUID uid,
+ GNOME_Evolution_Calendar_CalObjUID uid,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -261,7 +261,7 @@ Listener_obj_updated (PortableServer_Servant servant,
/* Listener::obj_removed method */
static void
Listener_obj_removed (PortableServer_Servant servant,
- Evolution_Calendar_CalObjUID uid,
+ GNOME_Evolution_Calendar_CalObjUID uid,
CORBA_Environment *ev)
{
CalListener *listener;
@@ -279,15 +279,15 @@ Listener_obj_removed (PortableServer_Servant servant,
*
* Return value: A newly-allocated EPV.
**/
-POA_Evolution_Calendar_Listener__epv *
+POA_GNOME_Evolution_Calendar_Listener__epv *
cal_listener_get_epv (void)
{
- POA_Evolution_Calendar_Listener__epv *epv;
+ POA_GNOME_Evolution_Calendar_Listener__epv *epv;
- epv = g_new0 (POA_Evolution_Calendar_Listener__epv, 1);
- epv->cal_loaded = Listener_cal_loaded;
- epv->obj_updated = Listener_obj_updated;
- epv->obj_removed = Listener_obj_removed;
+ epv = g_new0 (POA_GNOME_Evolution_Calendar_Listener__epv, 1);
+ epv->notifyCalLoaded = Listener_cal_loaded;
+ epv->notifyObjUpdated = Listener_obj_updated;
+ epv->notifyObjRemoved = Listener_obj_removed;
return epv;
}
@@ -304,7 +304,7 @@ cal_listener_get_epv (void)
* Return value: the same object as the @listener argument.
**/
CalListener *
-cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba_listener)
+cal_listener_construct (CalListener *listener, GNOME_Evolution_Calendar_Listener corba_listener)
{
g_return_val_if_fail (listener != NULL, NULL);
g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
@@ -323,20 +323,20 @@ cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba
* Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
* failure.
**/
-Evolution_Calendar_Listener
+GNOME_Evolution_Calendar_Listener
cal_listener_corba_object_create (BonoboObject *object)
{
- POA_Evolution_Calendar_Listener *servant;
+ POA_GNOME_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_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &cal_listener_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -344,7 +344,7 @@ cal_listener_corba_object_create (BonoboObject *object)
}
CORBA_exception_free (&ev);
- return (Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
+ return (GNOME_Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
}
/**
@@ -361,7 +361,7 @@ cal_listener_new (void)
{
CalListener *listener;
CORBA_Environment ev;
- Evolution_Calendar_Listener corba_listener;
+ GNOME_Evolution_Calendar_Listener corba_listener;
gboolean result;
listener = gtk_type_new (CAL_LISTENER_TYPE);
@@ -390,7 +390,7 @@ cal_listener_new (void)
*
* Return value: The calendar that the listener is watching.
**/
-Evolution_Calendar_Cal
+GNOME_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 b4eda6c2d6..1a12f07ca2 100644
--- a/calendar/cal-client/cal-listener.h
+++ b/calendar/cal-client/cal-listener.h
@@ -55,24 +55,24 @@ struct _CalListenerClass {
/* Notification signals */
void (* cal_loaded) (CalListener *listener,
- Evolution_Calendar_Listener_LoadStatus status,
- Evolution_Calendar_Cal cal);
- void (* obj_updated) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
- void (* obj_removed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
+ GNOME_Evolution_Calendar_Listener_LoadStatus status,
+ GNOME_Evolution_Calendar_Cal cal);
+ void (* obj_updated) (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid);
+ void (* obj_removed) (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid);
};
GtkType cal_listener_get_type (void);
CalListener *cal_listener_construct (CalListener *listener,
- Evolution_Calendar_Listener corba_listener);
+ GNOME_Evolution_Calendar_Listener corba_listener);
-Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
+GNOME_Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
CalListener *cal_listener_new (void);
-Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
+GNOME_Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
-POA_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
+POA_GNOME_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
index f8e0795590..bd61419d04 100644
--- a/calendar/gui/Evolution-Composer.h
+++ b/calendar/gui/Evolution-Composer.h
@@ -15,352 +15,335 @@ extern "C"
/** typedefs **/
#include <bonobo/Bonobo.h>
-#if !defined(ORBIT_DECL_Evolution_Composer) && !defined(_Evolution_Composer_defined)
-#define ORBIT_DECL_Evolution_Composer 1
-#define _Evolution_Composer_defined 1
-#define Evolution_Composer__free CORBA_Object__free
- typedef CORBA_Object Evolution_Composer;
- extern CORBA_unsigned_long Evolution_Composer__classid;
-#if !defined(TC_IMPL_TC_Evolution_Composer_0)
-#define TC_IMPL_TC_Evolution_Composer_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_5 't'
-#define TC_IMPL_TC_Evolution_Composer_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_15 's'
-#define TC_IMPL_TC_Evolution_Composer_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_17 'r'
- extern const struct CORBA_TypeCode_struct TC_Evolution_Composer_struct;
-#define TC_Evolution_Composer ((CORBA_TypeCode)&TC_Evolution_Composer_struct)
+#if !defined(ORBIT_DECL_GNOME_Evolution_Composer) && !defined(_GNOME_Evolution_Composer_defined)
+#define ORBIT_DECL_GNOME_Evolution_Composer 1
+#define _GNOME_Evolution_Composer_defined 1
+#define GNOME_Evolution_Composer__free CORBA_Object__free
+ typedef CORBA_Object GNOME_Evolution_Composer;
+ extern CORBA_unsigned_long GNOME_Evolution_Composer__classid;
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_17 'r'
+ extern const struct CORBA_TypeCode_struct
+ TC_GNOME_Evolution_Composer_struct;
+#define TC_GNOME_Evolution_Composer ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_struct)
#endif
#endif
-#if !defined(_Evolution_Composer_Recipient_defined)
-#define _Evolution_Composer_Recipient_defined 1
+#if !defined(_GNOME_Evolution_Composer_Recipient_defined)
+#define _GNOME_Evolution_Composer_Recipient_defined 1
typedef struct
{
CORBA_char *name;
CORBA_char *address;
}
- Evolution_Composer_Recipient;
+ GNOME_Evolution_Composer_Recipient;
-#if !defined(TC_IMPL_TC_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_17 'r'
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_17 'r'
extern const struct CORBA_TypeCode_struct
- TC_Evolution_Composer_Recipient_struct;
-#define TC_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_Evolution_Composer_Recipient_struct)
+ TC_GNOME_Evolution_Composer_Recipient_struct;
+#define TC_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_Recipient_struct)
#endif
- extern Evolution_Composer_Recipient
- *Evolution_Composer_Recipient__alloc(void);
- extern gpointer Evolution_Composer_Recipient__free(gpointer mem,
- gpointer dat,
- CORBA_boolean free_strings); /* ORBit internal use */
+ extern GNOME_Evolution_Composer_Recipient
+ *GNOME_Evolution_Composer_Recipient__alloc(void);
+ extern gpointer GNOME_Evolution_Composer_Recipient__free(gpointer mem,
+ gpointer dat,
+ CORBA_boolean free_strings); /* ORBit internal use */
#endif
-#if !defined(ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_Evolution_Composer_Recipient_defined)
-#define ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient 1
-#define _CORBA_sequence_Evolution_Composer_Recipient_defined 1
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_5 't'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_15 's'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+#if !defined(ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined)
+#define ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient 1
+#define _CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined 1
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
typedef struct
{
CORBA_unsigned_long _maximum,
_length;
- Evolution_Composer_Recipient *_buffer;
+ GNOME_Evolution_Composer_Recipient *_buffer;
CORBA_boolean _release;
}
- CORBA_sequence_Evolution_Composer_Recipient;
-#if !defined(TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+ CORBA_sequence_GNOME_Evolution_Composer_Recipient;
+#if !defined(TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
extern const struct CORBA_TypeCode_struct
- TC_CORBA_sequence_Evolution_Composer_Recipient_struct;
-#define TC_CORBA_sequence_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_Evolution_Composer_Recipient_struct)
+ TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct;
+#define TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct)
#endif
- extern CORBA_sequence_Evolution_Composer_Recipient
- *CORBA_sequence_Evolution_Composer_Recipient__alloc(void);
- extern gpointer CORBA_sequence_Evolution_Composer_Recipient__free(gpointer
- mem,
- gpointer
- dat,
- CORBA_boolean free_strings); /* ORBit internal use */
- Evolution_Composer_Recipient
- *CORBA_sequence_Evolution_Composer_Recipient_allocbuf
+ extern CORBA_sequence_GNOME_Evolution_Composer_Recipient
+ *CORBA_sequence_GNOME_Evolution_Composer_Recipient__alloc(void);
+ extern gpointer
+ CORBA_sequence_GNOME_Evolution_Composer_Recipient__free(gpointer mem,
+ gpointer dat,
+ CORBA_boolean free_strings); /* ORBit internal use */
+ GNOME_Evolution_Composer_Recipient
+ *CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf
(CORBA_unsigned_long len);
#endif
-#if !defined(_Evolution_Composer_RecipientList_defined)
-#define _Evolution_Composer_RecipientList_defined 1
- typedef CORBA_sequence_Evolution_Composer_Recipient
- Evolution_Composer_RecipientList;
-#if !defined(TC_IMPL_TC_Evolution_Composer_RecipientList_0)
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_5 't'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_15 's'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_17 'r'
+#if !defined(_GNOME_Evolution_Composer_RecipientList_defined)
+#define _GNOME_Evolution_Composer_RecipientList_defined 1
+ typedef CORBA_sequence_GNOME_Evolution_Composer_Recipient
+ GNOME_Evolution_Composer_RecipientList;
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_17 'r'
extern const struct CORBA_TypeCode_struct
- TC_Evolution_Composer_RecipientList_struct;
-#define TC_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_Evolution_Composer_RecipientList_struct)
+ TC_GNOME_Evolution_Composer_RecipientList_struct;
+#define TC_GNOME_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_RecipientList_struct)
#endif
- extern Evolution_Composer_RecipientList
- *Evolution_Composer_RecipientList__alloc(void);
- extern gpointer Evolution_Composer_RecipientList__free(gpointer mem,
- gpointer dat,
- CORBA_boolean free_strings); /* ORBit internal use */
+ extern GNOME_Evolution_Composer_RecipientList
+ *GNOME_Evolution_Composer_RecipientList__alloc(void);
+ extern gpointer GNOME_Evolution_Composer_RecipientList__free(gpointer mem,
+ gpointer dat,
+ CORBA_boolean free_strings); /* ORBit internal use */
#endif
-#define ex_Evolution_Composer_CouldNotParse "IDL:Evolution/Composer/CouldNotParse:1.0"
- void _ORBIT_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer *
- _ORBIT_recv_buffer,
- CORBA_Environment *
- ev);
- void _ORBIT_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
- _ORBIT_send_buffer,
- CORBA_Environment *
- ev);
-#if !defined(_Evolution_Composer_CouldNotParse_defined)
-#define _Evolution_Composer_CouldNotParse_defined 1
+#define ex_GNOME_Evolution_Composer_CouldNotParse "IDL:GNOME/Evolution/Composer/CouldNotParse:1.0"
+ void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer
+ *
+ _ORBIT_recv_buffer,
+ CORBA_Environment
+ * ev);
+ void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
+ _ORBIT_send_buffer,
+ CORBA_Environment
+ * ev);
+#if !defined(_GNOME_Evolution_Composer_CouldNotParse_defined)
+#define _GNOME_Evolution_Composer_CouldNotParse_defined 1
typedef struct
{
int dummy;
}
- Evolution_Composer_CouldNotParse;
+ GNOME_Evolution_Composer_CouldNotParse;
-#if !defined(TC_IMPL_TC_Evolution_Composer_CouldNotParse_0)
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_5 't'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_15 's'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_17 'r'
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_17 'r'
extern const struct CORBA_TypeCode_struct
- TC_Evolution_Composer_CouldNotParse_struct;
-#define TC_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_Evolution_Composer_CouldNotParse_struct)
+ TC_GNOME_Evolution_Composer_CouldNotParse_struct;
+#define TC_GNOME_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_CouldNotParse_struct)
#endif
-#define Evolution_Composer_CouldNotParse__alloc() NULL
- extern gpointer Evolution_Composer_CouldNotParse__free(gpointer mem,
- gpointer dat,
- CORBA_boolean free_strings); /* ORBit internal use */
+#define GNOME_Evolution_Composer_CouldNotParse__alloc() NULL
+ extern gpointer GNOME_Evolution_Composer_CouldNotParse__free(gpointer mem,
+ gpointer dat,
+ CORBA_boolean free_strings); /* ORBit internal use */
#endif
/** POA structures **/
typedef struct
{
void *_private;
- void (*set_headers) (PortableServer_Servant _servant,
- const Evolution_Composer_RecipientList * to,
- const Evolution_Composer_RecipientList * cc,
- const Evolution_Composer_RecipientList * bcc,
- const CORBA_char * subject,
- CORBA_Environment * ev);
- void (*set_body_text) (PortableServer_Servant _servant,
- const CORBA_char * body, CORBA_Environment * ev);
- void (*attach_MIME) (PortableServer_Servant _servant,
- const CORBA_char * data, CORBA_Environment * ev);
- void (*attach_data) (PortableServer_Servant _servant,
- const CORBA_char * content_type,
- const CORBA_char * filename,
- const CORBA_char * description,
- const CORBA_boolean show_inline,
- const CORBA_char * data, CORBA_Environment * ev);
+ void (*setHeaders) (PortableServer_Servant _servant,
+ const GNOME_Evolution_Composer_RecipientList * to,
+ const GNOME_Evolution_Composer_RecipientList * cc,
+ const GNOME_Evolution_Composer_RecipientList * bcc,
+ const CORBA_char * subject, CORBA_Environment * ev);
+ void (*setBodyText) (PortableServer_Servant _servant,
+ const CORBA_char * body, CORBA_Environment * ev);
+ void (*attachMIME) (PortableServer_Servant _servant,
+ const CORBA_char * data, CORBA_Environment * ev);
+ void (*attachData) (PortableServer_Servant _servant,
+ const CORBA_char * content_type,
+ const CORBA_char * filename,
+ const CORBA_char * description,
+ const CORBA_boolean show_inline,
+ const CORBA_char * data, CORBA_Environment * ev);
void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
}
- POA_Evolution_Composer__epv;
+ POA_GNOME_Evolution_Composer__epv;
typedef struct
{
PortableServer_ServantBase__epv *_base_epv;
POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
- POA_Evolution_Composer__epv *Evolution_Composer_epv;
+ POA_GNOME_Evolution_Composer__epv *GNOME_Evolution_Composer_epv;
}
- POA_Evolution_Composer__vepv;
+ POA_GNOME_Evolution_Composer__vepv;
typedef struct
{
void *_private;
- POA_Evolution_Composer__vepv *vepv;
+ POA_GNOME_Evolution_Composer__vepv *vepv;
}
- POA_Evolution_Composer;
- extern void POA_Evolution_Composer__init(PortableServer_Servant servant,
- CORBA_Environment * ev);
- extern void POA_Evolution_Composer__fini(PortableServer_Servant servant,
- CORBA_Environment * ev);
+ POA_GNOME_Evolution_Composer;
+ extern void POA_GNOME_Evolution_Composer__init(PortableServer_Servant
+ servant,
+ CORBA_Environment * ev);
+ extern void POA_GNOME_Evolution_Composer__fini(PortableServer_Servant
+ servant,
+ CORBA_Environment * ev);
/** prototypes **/
-#define Evolution_Composer_ref Bonobo_Unknown_ref
-#define Evolution_Composer_unref Bonobo_Unknown_unref
-#define Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
- void Evolution_Composer_set_headers(Evolution_Composer _obj,
- const Evolution_Composer_RecipientList
- * to,
- const Evolution_Composer_RecipientList
- * cc,
- const Evolution_Composer_RecipientList
- * bcc, const CORBA_char * subject,
- CORBA_Environment * ev);
- void Evolution_Composer_set_body_text(Evolution_Composer _obj,
- const CORBA_char * body,
- CORBA_Environment * ev);
- void Evolution_Composer_attach_MIME(Evolution_Composer _obj,
- const CORBA_char * data,
- CORBA_Environment * ev);
- void Evolution_Composer_attach_data(Evolution_Composer _obj,
- const CORBA_char * content_type,
- const CORBA_char * filename,
- const CORBA_char * description,
- const CORBA_boolean show_inline,
- const CORBA_char * data,
- CORBA_Environment * ev);
- void Evolution_Composer_show(Evolution_Composer _obj,
- CORBA_Environment * ev);
+#define GNOME_Evolution_Composer_ref Bonobo_Unknown_ref
+#define GNOME_Evolution_Composer_unref Bonobo_Unknown_unref
+#define GNOME_Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
+ void GNOME_Evolution_Composer_setHeaders(GNOME_Evolution_Composer _obj,
+ const
+ GNOME_Evolution_Composer_RecipientList
+ * to,
+ const
+ GNOME_Evolution_Composer_RecipientList
+ * cc,
+ const
+ GNOME_Evolution_Composer_RecipientList
+ * bcc, const CORBA_char * subject,
+ CORBA_Environment * ev);
+ void GNOME_Evolution_Composer_setBodyText(GNOME_Evolution_Composer _obj,
+ const CORBA_char * body,
+ CORBA_Environment * ev);
+ void GNOME_Evolution_Composer_attachMIME(GNOME_Evolution_Composer _obj,
+ const CORBA_char * data,
+ CORBA_Environment * ev);
+ void GNOME_Evolution_Composer_attachData(GNOME_Evolution_Composer _obj,
+ const CORBA_char * content_type,
+ const CORBA_char * filename,
+ const CORBA_char * description,
+ const CORBA_boolean show_inline,
+ const CORBA_char * data,
+ CORBA_Environment * ev);
+ void GNOME_Evolution_Composer_show(GNOME_Evolution_Composer _obj,
+ CORBA_Environment * ev);
- void _ORBIT_skel_Evolution_Composer_set_headers(POA_Evolution_Composer *
- _ORBIT_servant,
- GIOPRecvBuffer *
- _ORBIT_recv_buffer,
- CORBA_Environment * ev,
- void (*_impl_set_headers)
- (PortableServer_Servant
- _servant,
- const
- Evolution_Composer_RecipientList
- * to,
- const
- Evolution_Composer_RecipientList
- * cc,
- const
- Evolution_Composer_RecipientList
- * bcc,
- const CORBA_char *
- subject,
- CORBA_Environment * ev));
- void _ORBIT_skel_Evolution_Composer_set_body_text(POA_Evolution_Composer *
- _ORBIT_servant,
- GIOPRecvBuffer *
- _ORBIT_recv_buffer,
- CORBA_Environment * ev,
- void
- (*_impl_set_body_text)
- (PortableServer_Servant
- _servant,
- const CORBA_char * body,
- CORBA_Environment *
- ev));
- void _ORBIT_skel_Evolution_Composer_attach_MIME(POA_Evolution_Composer *
- _ORBIT_servant,
- GIOPRecvBuffer *
- _ORBIT_recv_buffer,
- CORBA_Environment * ev,
- void (*_impl_attach_MIME)
- (PortableServer_Servant
- _servant,
- const CORBA_char * data,
- CORBA_Environment * ev));
- void _ORBIT_skel_Evolution_Composer_attach_data(POA_Evolution_Composer *
- _ORBIT_servant,
- GIOPRecvBuffer *
- _ORBIT_recv_buffer,
- CORBA_Environment * ev,
- void (*_impl_attach_data)
- (PortableServer_Servant
- _servant,
- const CORBA_char *
- content_type,
- const CORBA_char *
- filename,
- const CORBA_char *
- description,
- const CORBA_boolean
- show_inline,
- const CORBA_char * data,
- CORBA_Environment * ev));
- void _ORBIT_skel_Evolution_Composer_show(POA_Evolution_Composer *
- _ORBIT_servant,
- GIOPRecvBuffer *
- _ORBIT_recv_buffer,
- CORBA_Environment * ev,
- void (*_impl_show)
- (PortableServer_Servant _servant,
- CORBA_Environment * ev));
+ void
+ _ORBIT_skel_GNOME_Evolution_Composer_setHeaders
+ (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+ GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+ void (*_impl_setHeaders) (PortableServer_Servant _servant,
+ const GNOME_Evolution_Composer_RecipientList
+ * to,
+ const GNOME_Evolution_Composer_RecipientList
+ * cc,
+ const GNOME_Evolution_Composer_RecipientList
+ * bcc, const CORBA_char * subject,
+ CORBA_Environment * ev));
+ void
+ _ORBIT_skel_GNOME_Evolution_Composer_setBodyText
+ (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+ GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+ void (*_impl_setBodyText) (PortableServer_Servant _servant,
+ const CORBA_char * body,
+ CORBA_Environment * ev));
+ void
+ _ORBIT_skel_GNOME_Evolution_Composer_attachMIME
+ (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+ GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+ void (*_impl_attachMIME) (PortableServer_Servant _servant,
+ const CORBA_char * data,
+ CORBA_Environment * ev));
+ void
+ _ORBIT_skel_GNOME_Evolution_Composer_attachData
+ (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+ GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+ void (*_impl_attachData) (PortableServer_Servant _servant,
+ const CORBA_char * content_type,
+ const CORBA_char * filename,
+ const CORBA_char * description,
+ const CORBA_boolean show_inline,
+ const CORBA_char * data,
+ CORBA_Environment * ev));
+ void _ORBIT_skel_GNOME_Evolution_Composer_show(POA_GNOME_Evolution_Composer
+ * _ORBIT_servant,
+ GIOPRecvBuffer *
+ _ORBIT_recv_buffer,
+ CORBA_Environment * ev,
+ void (*_impl_show)
+ (PortableServer_Servant
+ _servant,
+ CORBA_Environment * ev));
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 724594780d..331c0c68ee 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -10,8 +10,8 @@ IDL_GENERATED = \
Evolution-Composer-stubs.c
$(IDL_GENERATED): $(IDLS)
- $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
- -I . $(srcdir)/../../composer/Evolution-Composer.idl
+ $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
+ $(srcdir)/../../composer/Evolution-Composer.idl
SUBDIRS = dialogs
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 2376cdb5b5..5d4ca06a74 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -235,10 +235,10 @@ static void
send_itip_reply (EItipControlPrivate *priv)
{
BonoboObjectClient *bonobo_server;
- Evolution_Composer composer_server;
+ GNOME_Evolution_Composer composer_server;
CORBA_Environment ev;
- Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
- Evolution_Composer_Recipient *recipient;
+ GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
+ GNOME_Evolution_Composer_Recipient *recipient;
CORBA_char *subject;
CalComponentText caltext;
CORBA_char *content_type, *filename, *description, *attach_data;
@@ -256,10 +256,10 @@ send_itip_reply (EItipControlPrivate *priv)
/* Now I have to make a CORBA sequence that represents a recipient list with
one item, for the organizer. */
- to_list = Evolution_Composer_RecipientList__alloc ();
+ to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
to_list->_maximum = 1;
to_list->_length = 1;
- to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (1);
+ to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (1);
recipient = &(to_list->_buffer[0]);
recipient->name = CORBA_string_alloc (0); /* FIXME: we may want an actual name here. */
@@ -267,16 +267,16 @@ send_itip_reply (EItipControlPrivate *priv)
recipient->address = CORBA_string_alloc (strlen (priv->organizer));
strcpy (recipient->address, priv->organizer);
- cc_list = Evolution_Composer_RecipientList__alloc ();
+ cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
cc_list->_maximum = cc_list->_length = 0;
- bcc_list = Evolution_Composer_RecipientList__alloc ();
+ bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
bcc_list->_maximum = bcc_list->_length = 0;
cal_component_get_summary (priv->cal_comp, &caltext);
subject = CORBA_string_alloc (strlen (caltext.value));
strcpy (subject, caltext.value);
- Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev);
+ GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
CORBA_exception_free (&ev);
@@ -331,10 +331,10 @@ send_itip_reply (EItipControlPrivate *priv)
}
- Evolution_Composer_attach_data (composer_server,
- content_type, filename, description,
- show_inline, attach_data,
- &ev);
+ GNOME_Evolution_Composer_attachData (composer_server,
+ content_type, filename, description,
+ show_inline, attach_data,
+ &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
@@ -342,7 +342,7 @@ send_itip_reply (EItipControlPrivate *priv)
return;
}
- Evolution_Composer_show (composer_server, &ev);
+ GNOME_Evolution_Composer_show (composer_server, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
index cf1cffee52..daf5c73035 100644
--- a/calendar/gui/e-meeting-edit.c
+++ b/calendar/gui/e-meeting-edit.c
@@ -517,10 +517,10 @@ static void
send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
{
BonoboObjectClient *bonobo_server;
- Evolution_Composer composer_server;
+ GNOME_Evolution_Composer composer_server;
CORBA_Environment ev;
- Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
- Evolution_Composer_Recipient *recipient;
+ GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
+ GNOME_Evolution_Composer_Recipient *recipient;
gchar *cell_text;
CORBA_char *subject;
gint cntr;
@@ -542,10 +542,10 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
/* All right, now I have to convert my list of recipients into one of those
CORBA sequences. */
- to_list = Evolution_Composer_RecipientList__alloc ();
+ to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
to_list->_maximum = priv->numentries;
to_list->_length = priv->numentries;
- to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (priv->numentries);
+ to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (priv->numentries);
for (cntr = 0; cntr < priv->numentries; cntr++) {
gtk_clist_get_text (GTK_CLIST (priv->attendee_list),
@@ -560,16 +560,16 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
strcpy (recipient->address, cell_text);
}
- cc_list = Evolution_Composer_RecipientList__alloc ();
+ cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
cc_list->_maximum = cc_list->_length = 0;
- bcc_list = Evolution_Composer_RecipientList__alloc ();
+ bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
bcc_list->_maximum = bcc_list->_length = 0;
cal_component_get_summary (priv->comp, &caltext);
subject = CORBA_string_alloc (strlen (caltext.value));
strcpy (subject, caltext.value);
- Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev);
+ GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
CORBA_exception_free (&ev);
@@ -635,7 +635,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
fclose (fp);
}
- Evolution_Composer_attach_data (composer_server,
+ GNOME_Evolution_Composer_attachData (composer_server,
content_type, filename, description,
show_inline, attach_data,
&ev);
@@ -646,7 +646,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
return;
}
- Evolution_Composer_show (composer_server, &ev);
+ GNOME_Evolution_Composer_show (composer_server, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl
index ab80ff8702..7969357e9a 100644
--- a/calendar/idl/evolution-calendar.idl
+++ b/calendar/idl/evolution-calendar.idl
@@ -12,6 +12,7 @@
#include <Bonobo.idl>
+module GNOME {
module Evolution {
module Calendar {
@@ -93,45 +94,48 @@ module Calendar {
readonly attribute string uri;
/* Gets the number of objects of the specified types */
- long get_n_objects (in CalObjType type);
+ long countObjects (in CalObjType type);
/* Gets an object based on its URI */
- CalObj get_object (in CalObjUID uid)
+ CalObj getObject (in CalObjUID uid)
raises (NotFound);
/* Gets a list of UIDs based on object type */
- CalObjUIDSeq get_uids (in CalObjType type);
+ CalObjUIDSeq getUIds (in CalObjType type);
- /* Gets a list of UIDs that changed based on object type */
- CalObjChangeSeq get_changed_uids (in CalObjType type, in Time_t since);
+ /* Gets a list of UIds that changed based on object type */
+ CalObjChangeSeq getChangedUIds (in CalObjType type, in Time_t since);
/* Gets a list of objects that occur or recur in the specified time range */
- CalObjUIDSeq get_objects_in_range (in CalObjType type,
- in Time_t start, in Time_t end)
+ CalObjUIDSeq getObjectsInRange (in CalObjType type,
+ in Time_t start, in Time_t end)
raises (InvalidRange);
- /* Gets the objects whose alarms trigger in the specified time
+ /*
+ * Gets the objects whose alarms trigger in the specified time
* range.
*/
- CalAlarmInstanceSeq get_alarms_in_range (in Time_t start, in Time_t end)
+ CalAlarmInstanceSeq getAlarmsInRange (in Time_t start, in Time_t end)
raises (InvalidRange);
- /* Gets the alarms for the specified object that trigger in the
+ /*
+ * Gets the alarms for the specified object that trigger in the
* specified time range.
*/
- CalAlarmInstanceSeq get_alarms_for_object (in CalObjUID uid,
- in Time_t start, in Time_t end)
+ CalAlarmInstanceSeq getAlarmsForObject (in CalObjUID uid,
+ in Time_t start, in Time_t end)
raises (NotFound, InvalidRange);
- /* Updates an object by adding it if it does not exist or by
+ /*
+ * Updates an object by adding it if it does not exist or by
* changing an existing one.
*/
- void update_object (in CalObjUID uid, in CalObj calobj)
+ void updateObject (in CalObjUID uid, in CalObj calobj)
raises (InvalidObject);
/* Removes an object */
- void remove_object (in CalObjUID uid)
+ void removeObject (in CalObjUID uid)
raises (NotFound);
};
@@ -150,13 +154,13 @@ module Calendar {
/* Called from a CalFactory when a calendar is initially loaded
* or created. The listener must remember the cal object.
*/
- void cal_loaded (in LoadStatus status, in Cal cal);
+ void notifyCalLoaded (in LoadStatus status, in Cal cal);
/* Called from a Calendar when an object is added or changed */
- void obj_updated (in CalObjUID uid);
+ void notifyObjUpdated (in CalObjUID uid);
/* Called from a Calendar when an object is removed */
- void obj_removed (in CalObjUID uid);
+ void notifyObjRemoved (in CalObjUID uid);
};
/* A calendar factory, can load and create calendars */
@@ -174,5 +178,6 @@ module Calendar {
};
};
+};
#endif
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index 5ca12eff6e..984dcde86a 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -16,7 +16,7 @@ CORBA_GENERATED = \
idls = \
$(srcdir)/../idl/evolution-calendar.idl
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
+idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
$(CORBA_GENERATED): $(idls)
$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
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);
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
index 9405a05ef8..5e61d26ab5 100644
--- a/calendar/pcs/cal-factory.h
+++ b/calendar/pcs/cal-factory.h
@@ -59,8 +59,8 @@ struct _CalFactoryClass {
GtkType cal_factory_get_type (void);
-CalFactory *cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory);
-Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
+CalFactory *cal_factory_construct (CalFactory *factory, GNOME_Evolution_Calendar_CalFactory corba_factory);
+GNOME_Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
CalFactory *cal_factory_new (void);
@@ -68,7 +68,7 @@ void cal_factory_register_method (CalFactory *factory, const char *method, GtkTy
int cal_factory_get_n_backends (CalFactory *factory);
-POA_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void);
+POA_GNOME_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void);
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 35d98abd64..8383d135fb 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -31,7 +31,7 @@ struct _CalPrivate {
CalBackend *backend;
/* Listener on the client we notify */
- Evolution_Calendar_Listener listener;
+ GNOME_Evolution_Calendar_Listener listener;
};
@@ -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_Evolution_Calendar_Cal__vepv cal_vepv;
+static POA_GNOME_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.Evolution_Calendar_Cal_epv = cal_get_epv ();
+ cal_vepv.GNOME_Evolution_Calendar_Cal_epv = cal_get_epv ();
}
/* Class initialization function for the calendar */
@@ -172,17 +172,17 @@ Cal_get_uri (PortableServer_Servant servant,
* representation.
*/
static CalObjType
-uncorba_obj_type (Evolution_Calendar_CalObjType type)
+uncorba_obj_type (GNOME_Evolution_Calendar_CalObjType type)
{
- return (((type & Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
- | ((type & Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
- | ((type & Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
+ return (((type & GNOME_Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
+ | ((type & GNOME_Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
+ | ((type & GNOME_Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
}
/* Cal::get_n_objects method */
static CORBA_long
Cal_get_n_objects (PortableServer_Servant servant,
- Evolution_Calendar_CalObjType type,
+ GNOME_Evolution_Calendar_CalObjType type,
CORBA_Environment *ev)
{
Cal *cal;
@@ -199,9 +199,9 @@ Cal_get_n_objects (PortableServer_Servant servant,
}
/* Cal::get_object method */
-static Evolution_Calendar_CalObj
+static GNOME_Evolution_Calendar_CalObj
Cal_get_object (PortableServer_Servant servant,
- const Evolution_Calendar_CalObjUID uid,
+ const GNOME_Evolution_Calendar_CalObjUID uid,
CORBA_Environment *ev)
{
Cal *cal;
@@ -221,25 +221,25 @@ Cal_get_object (PortableServer_Servant servant,
return calobj_copy;
} else {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_Evolution_Calendar_Cal_NotFound,
+ ex_GNOME_Evolution_Calendar_Cal_NotFound,
NULL);
return NULL;
}
}
-static Evolution_Calendar_CalObjUIDSeq *
+static GNOME_Evolution_Calendar_CalObjUIDSeq *
build_uid_seq (GList *uids)
{
- Evolution_Calendar_CalObjUIDSeq *seq;
+ GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
GList *l;
int n, i;
n = g_list_length (uids);
- seq = Evolution_Calendar_CalObjUIDSeq__alloc ();
+ seq = GNOME_Evolution_Calendar_CalObjUIDSeq__alloc ();
CORBA_sequence_set_release (seq, TRUE);
seq->_length = n;
- seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjUID_allocbuf (n);
+ seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_allocbuf (n);
/* Fill the sequence */
@@ -254,15 +254,15 @@ build_uid_seq (GList *uids)
}
/* Cal::get_uids method */
-static Evolution_Calendar_CalObjUIDSeq *
+static GNOME_Evolution_Calendar_CalObjUIDSeq *
Cal_get_uids (PortableServer_Servant servant,
- Evolution_Calendar_CalObjType type,
+ GNOME_Evolution_Calendar_CalObjType type,
CORBA_Environment *ev)
{
Cal *cal;
CalPrivate *priv;
GList *uids;
- Evolution_Calendar_CalObjUIDSeq *seq;
+ GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
int t;
cal = CAL (bonobo_object_from_servant (servant));
@@ -278,24 +278,24 @@ Cal_get_uids (PortableServer_Servant servant,
return seq;
}
-static Evolution_Calendar_CalObjChangeSeq *
+static GNOME_Evolution_Calendar_CalObjChangeSeq *
build_change_seq (GList *changes)
{
GList *l;
int n, i;
- Evolution_Calendar_CalObjChangeSeq *seq;
+ GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
n = g_list_length (changes);
- seq = Evolution_Calendar_CalObjChangeSeq__alloc ();
+ seq = GNOME_Evolution_Calendar_CalObjChangeSeq__alloc ();
CORBA_sequence_set_release (seq, TRUE);
seq->_length = n;
- seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjChange_allocbuf (n);
+ seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_allocbuf (n);
/* Fill the sequence */
for (i = 0, l = changes; l; i++, l = l->next) {
CalObjChange *c;
- Evolution_Calendar_CalObjChange *corba_c;
+ GNOME_Evolution_Calendar_CalObjChange *corba_c;
c = l->data;
corba_c = &seq->_buffer[i];
@@ -308,16 +308,16 @@ build_change_seq (GList *changes)
}
/* Cal::get_changed_uids method */
-static Evolution_Calendar_CalObjChangeSeq *
+static GNOME_Evolution_Calendar_CalObjChangeSeq *
Cal_get_changed_uids (PortableServer_Servant servant,
- Evolution_Calendar_CalObjType type,
- Evolution_Calendar_Time_t since,
+ GNOME_Evolution_Calendar_CalObjType type,
+ GNOME_Evolution_Calendar_Time_t since,
CORBA_Environment *ev)
{
Cal *cal;
CalPrivate *priv;
GList *changes;
- Evolution_Calendar_CalObjChangeSeq *seq;
+ GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
int t;
time_t s;
@@ -336,18 +336,18 @@ Cal_get_changed_uids (PortableServer_Servant servant,
}
/* Cal::get_objects_in_range method */
-static Evolution_Calendar_CalObjUIDSeq *
+static GNOME_Evolution_Calendar_CalObjUIDSeq *
Cal_get_objects_in_range (PortableServer_Servant servant,
- Evolution_Calendar_CalObjType type,
- Evolution_Calendar_Time_t start,
- Evolution_Calendar_Time_t end,
+ GNOME_Evolution_Calendar_CalObjType type,
+ GNOME_Evolution_Calendar_Time_t start,
+ GNOME_Evolution_Calendar_Time_t end,
CORBA_Environment *ev)
{
Cal *cal;
CalPrivate *priv;
int t;
time_t t_start, t_end;
- Evolution_Calendar_CalObjUIDSeq *seq;
+ GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
GList *uids;
cal = CAL (bonobo_object_from_servant (servant));
@@ -359,7 +359,7 @@ Cal_get_objects_in_range (PortableServer_Servant servant,
if (t_start > t_end || t_start == -1 || t_end == -1) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_Evolution_Calendar_Cal_InvalidRange,
+ ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
NULL);
return NULL;
}
@@ -398,25 +398,25 @@ corba_alarm_type (enum AlarmType type)
#endif
/* Builds a CORBA sequence of alarm instances from a CalAlarmInstance list. */
-static Evolution_Calendar_CalAlarmInstanceSeq *
+static GNOME_Evolution_Calendar_CalAlarmInstanceSeq *
build_alarm_instance_seq (GList *alarms)
{
GList *l;
int n, i;
- Evolution_Calendar_CalAlarmInstanceSeq *seq;
+ GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
n = g_list_length (alarms);
- seq = Evolution_Calendar_CalAlarmInstanceSeq__alloc ();
+ seq = GNOME_Evolution_Calendar_CalAlarmInstanceSeq__alloc ();
CORBA_sequence_set_release (seq, TRUE);
seq->_length = n;
- seq->_buffer = CORBA_sequence_Evolution_Calendar_CalAlarmInstance_allocbuf (n);
+ seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalAlarmInstance_allocbuf (n);
/* Fill the sequence */
for (i = 0, l = alarms; l; i++, l = l->next) {
CalAlarmInstance *ai;
- Evolution_Calendar_CalAlarmInstance *corba_ai;
+ GNOME_Evolution_Calendar_CalAlarmInstance *corba_ai;
ai = l->data;
corba_ai = &seq->_buffer[i];
@@ -433,16 +433,16 @@ build_alarm_instance_seq (GList *alarms)
}
/* Cal::get_alarms_in_range method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
+static GNOME_Evolution_Calendar_CalAlarmInstanceSeq *
Cal_get_alarms_in_range (PortableServer_Servant servant,
- Evolution_Calendar_Time_t start,
- Evolution_Calendar_Time_t end,
+ GNOME_Evolution_Calendar_Time_t start,
+ GNOME_Evolution_Calendar_Time_t end,
CORBA_Environment *ev)
{
Cal *cal;
CalPrivate *priv;
time_t t_start, t_end;
- Evolution_Calendar_CalAlarmInstanceSeq *seq;
+ GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
GList *alarms;
cal = CAL (bonobo_object_from_servant (servant));
@@ -453,7 +453,7 @@ Cal_get_alarms_in_range (PortableServer_Servant servant,
if (t_start > t_end || t_start == -1 || t_end == -1) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_Evolution_Calendar_Cal_InvalidRange,
+ ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
NULL);
return NULL;
}
@@ -468,17 +468,17 @@ Cal_get_alarms_in_range (PortableServer_Servant servant,
}
/* Cal::get_alarms_for_object method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
+static GNOME_Evolution_Calendar_CalAlarmInstanceSeq *
Cal_get_alarms_for_object (PortableServer_Servant servant,
- const Evolution_Calendar_CalObjUID uid,
- Evolution_Calendar_Time_t start,
- Evolution_Calendar_Time_t end,
+ const GNOME_Evolution_Calendar_CalObjUID uid,
+ GNOME_Evolution_Calendar_Time_t start,
+ GNOME_Evolution_Calendar_Time_t end,
CORBA_Environment *ev)
{
Cal *cal;
CalPrivate *priv;
time_t t_start, t_end;
- Evolution_Calendar_CalAlarmInstanceSeq *seq;
+ GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
GList *alarms;
gboolean result;
@@ -490,7 +490,7 @@ Cal_get_alarms_for_object (PortableServer_Servant servant,
if (t_start > t_end || t_start == -1 || t_end == -1) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_Evolution_Calendar_Cal_InvalidRange,
+ ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
NULL);
return NULL;
}
@@ -498,7 +498,7 @@ Cal_get_alarms_for_object (PortableServer_Servant servant,
result = cal_backend_get_alarms_for_object (priv->backend, uid, t_start, t_end, &alarms);
if (!result) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_Evolution_Calendar_Cal_NotFound,
+ ex_GNOME_Evolution_Calendar_Cal_NotFound,
NULL);
return NULL;
}
@@ -512,8 +512,8 @@ Cal_get_alarms_for_object (PortableServer_Servant servant,
/* Cal::update_object method */
static void
Cal_update_object (PortableServer_Servant servant,
- const Evolution_Calendar_CalObjUID uid,
- const Evolution_Calendar_CalObj calobj,
+ const GNOME_Evolution_Calendar_CalObjUID uid,
+ const GNOME_Evolution_Calendar_CalObj calobj,
CORBA_Environment *ev)
{
Cal *cal;
@@ -524,14 +524,14 @@ Cal_update_object (PortableServer_Servant servant,
if (!cal_backend_update_object (priv->backend, uid, calobj))
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_Evolution_Calendar_Cal_InvalidObject,
+ ex_GNOME_Evolution_Calendar_Cal_InvalidObject,
NULL);
}
/* Cal::remove_object method */
static void
Cal_remove_object (PortableServer_Servant servant,
- const Evolution_Calendar_CalObjUID uid,
+ const GNOME_Evolution_Calendar_CalObjUID uid,
CORBA_Environment *ev)
{
Cal *cal;
@@ -542,7 +542,7 @@ Cal_remove_object (PortableServer_Servant servant,
if (!cal_backend_remove_object (priv->backend, uid))
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
- ex_Evolution_Calendar_Cal_NotFound,
+ ex_GNOME_Evolution_Calendar_Cal_NotFound,
NULL);
}
@@ -554,22 +554,22 @@ Cal_remove_object (PortableServer_Servant servant,
*
* Return value: A newly-allocated EPV.
**/
-POA_Evolution_Calendar_Cal__epv *
+POA_GNOME_Evolution_Calendar_Cal__epv *
cal_get_epv (void)
{
- POA_Evolution_Calendar_Cal__epv *epv;
-
- epv = g_new0 (POA_Evolution_Calendar_Cal__epv, 1);
- epv->_get_uri = Cal_get_uri;
- epv->get_n_objects = Cal_get_n_objects;
- epv->get_object = Cal_get_object;
- epv->get_uids = Cal_get_uids;
- epv->get_changed_uids = Cal_get_changed_uids;
- epv->get_objects_in_range = Cal_get_objects_in_range;
- epv->get_alarms_in_range = Cal_get_alarms_in_range;
- epv->get_alarms_for_object = Cal_get_alarms_for_object;
- epv->update_object = Cal_update_object;
- epv->remove_object = Cal_remove_object;
+ POA_GNOME_Evolution_Calendar_Cal__epv *epv;
+
+ epv = g_new0 (POA_GNOME_Evolution_Calendar_Cal__epv, 1);
+ epv->_get_uri = Cal_get_uri;
+ epv->countObjects = Cal_get_n_objects;
+ epv->getObject = Cal_get_object;
+ epv->getUIds = Cal_get_uids;
+ epv->getChangedUIds = Cal_get_changed_uids;
+ epv->getObjectsInRange = Cal_get_objects_in_range;
+ epv->getAlarmsInRange = Cal_get_alarms_in_range;
+ epv->getAlarmsForObject = Cal_get_alarms_for_object;
+ epv->updateObject = Cal_update_object;
+ epv->removeObject = Cal_remove_object;
return epv;
}
@@ -591,9 +591,9 @@ cal_get_epv (void)
**/
Cal *
cal_construct (Cal *cal,
- Evolution_Calendar_Cal corba_cal,
+ GNOME_Evolution_Calendar_Cal corba_cal,
CalBackend *backend,
- Evolution_Calendar_Listener listener)
+ GNOME_Evolution_Calendar_Listener listener)
{
CalPrivate *priv;
CORBA_Environment ev;
@@ -632,20 +632,20 @@ cal_construct (Cal *cal,
* Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
* failure.
**/
-Evolution_Calendar_Cal
+GNOME_Evolution_Calendar_Cal
cal_corba_object_create (BonoboObject *object)
{
- POA_Evolution_Calendar_Cal *servant;
+ POA_GNOME_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_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &cal_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_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);
@@ -654,7 +654,7 @@ cal_corba_object_create (BonoboObject *object)
}
CORBA_exception_free (&ev);
- return (Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);
+ return (GNOME_Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);
}
/**
@@ -669,10 +669,10 @@ cal_corba_object_create (BonoboObject *object)
* if its corresponding CORBA object could not be created.
**/
Cal *
-cal_new (CalBackend *backend, Evolution_Calendar_Listener listener)
+cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener)
{
Cal *cal, *retval;
- Evolution_Calendar_Cal corba_cal;
+ GNOME_Evolution_Calendar_Cal corba_cal;
CORBA_Environment ev;
gboolean ret;
@@ -725,7 +725,7 @@ cal_notify_update (Cal *cal, const char *uid)
g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
CORBA_exception_init (&ev);
- Evolution_Calendar_Listener_obj_updated (priv->listener, (char *) uid, &ev);
+ GNOME_Evolution_Calendar_Listener_notifyObjUpdated (priv->listener, (char *) uid, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
g_message ("cal_notify_update(): could not notify the listener "
@@ -756,7 +756,7 @@ cal_notify_remove (Cal *cal, const char *uid)
g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
CORBA_exception_init (&ev);
- Evolution_Calendar_Listener_obj_removed (priv->listener, (char *) uid, &ev);
+ GNOME_Evolution_Calendar_Listener_notifyObjRemoved (priv->listener, (char *) uid, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
g_message ("cal_notify_remove(): could not notify the listener "
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
index 2b17278573..d4c9f02650 100644
--- a/calendar/pcs/cal.h
+++ b/calendar/pcs/cal.h
@@ -53,17 +53,17 @@ struct _CalClass {
GtkType cal_get_type (void);
Cal *cal_construct (Cal *cal,
- Evolution_Calendar_Cal corba_cal,
+ GNOME_Evolution_Calendar_Cal corba_cal,
CalBackend *backend,
- Evolution_Calendar_Listener listener);
-Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);
+ GNOME_Evolution_Calendar_Listener listener);
+GNOME_Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);
-Cal *cal_new (CalBackend *backend, Evolution_Calendar_Listener listener);
+Cal *cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener);
void cal_notify_update (Cal *cal, const char *uid);
void cal_notify_remove (Cal *cal, const char *uid);
-POA_Evolution_Calendar_Cal__epv *cal_get_epv (void);
+POA_GNOME_Evolution_Calendar_Cal__epv *cal_get_epv (void);