update proto

2004-01-27  JP Rosevear <jpr@ximian.com>

	* libecal/e-cal.h: update proto

	* libecal/e-cal.c (e_cal_remove): rename from
	e_cal_remove_calendar
	(e_cal_get_error_message): key on new status name

	* libecal/e-cal-types.h: rename
	E_CALENDAR_STATUS_CARD_ID_ALREADY_EXISTS to
	E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS, delete duplicate enum

	* idl/Evolution-DataServer-Calendar.idl: rename
	CardIdAlreadyExists to ObjectIdAlreadyExists

	* libecal/e-cal-listener.c (convert_status): key on new name

	* backends/file/e-cal-backend-file.c
	(e_cal_backend_file_create_object): return object id already
	exists

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f106b91..33520e7 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,24 @@
+2004-01-27  JP Rosevear <jpr@ximian.com>
+
+       * libecal/e-cal.h: update proto
+
+       * libecal/e-cal.c (e_cal_remove): rename from
+       e_cal_remove_calendar
+       (e_cal_get_error_message): key on new status name
+
+       * libecal/e-cal-types.h: rename
+       E_CALENDAR_STATUS_CARD_ID_ALREADY_EXISTS to
+       E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS, delete duplicate enum
+
+       * idl/Evolution-DataServer-Calendar.idl: rename
+       CardIdAlreadyExists to ObjectIdAlreadyExists
+
+       * libecal/e-cal-listener.c (convert_status): key on new name
+       
+       * backends/file/e-cal-backend-file.c
+       (e_cal_backend_file_create_object): return object id already
+       exists
+
 2004-01-27  Rodrigo Moya <rodrigo@ximian.com>
 
        * backends/groupwise/e-gw-connection.c

diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 02bb6e8..90dc364 100644 (file)
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -1633,7 +1633,7 @@ e_cal_backend_file_create_object (ECalBackendSync *backend, EDataCal *cal, const
        /* check the object is not in our cache */
        if (lookup_component (cbfile, comp_uid)) {
                icalcomponent_free (icalcomp);
-               return GNOME_Evolution_Calendar_CardIdAlreadyExists;
+               return GNOME_Evolution_Calendar_ObjectIdAlreadyExists;
        }
 
        /* Create the cal component */

diff --git a/calendar/idl/Evolution-DataServer-Calendar.idl b/calendar/idl/Evolution-DataServer-Calendar.idl
index 05cba3d..cc524ff 100644 (file)
--- a/calendar/idl/Evolution-DataServer-Calendar.idl
+++ b/calendar/idl/Evolution-DataServer-Calendar.idl
@@ -110,7 +110,7 @@ module Calendar {
                InvalidRange,
                ObjectNotFound,
                InvalidObject,
-               CardIdAlreadyExists,
+               ObjectIdAlreadyExists,
                AuthenticationFailed,
                AuthenticationRequired,
                UnsupportedField,

diff --git a/calendar/libecal/e-cal-listener.c b/calendar/libecal/e-cal-listener.c
index 36cb21c..c23df3c 100644 (file)
--- a/calendar/libecal/e-cal-listener.c
+++ b/calendar/libecal/e-cal-listener.c
@@ -83,8 +83,8 @@ convert_status (const GNOME_Evolution_Calendar_CallStatus status)
                return E_CALENDAR_STATUS_OBJECT_NOT_FOUND;
        case GNOME_Evolution_Calendar_InvalidObject:
                return E_CALENDAR_STATUS_INVALID_OBJECT;
-       case GNOME_Evolution_Calendar_CardIdAlreadyExists:
-               return E_CALENDAR_STATUS_CARD_ID_ALREADY_EXISTS;
+       case GNOME_Evolution_Calendar_ObjectIdAlreadyExists:
+               return E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS;
        case GNOME_Evolution_Calendar_AuthenticationFailed:
                return E_CALENDAR_STATUS_AUTHENTICATION_FAILED;
        case GNOME_Evolution_Calendar_AuthenticationRequired:

diff --git a/calendar/libecal/e-cal-types.h b/calendar/libecal/e-cal-types.h
index d3e7c79..71798f0 100644 (file)
--- a/calendar/libecal/e-cal-types.h
+++ b/calendar/libecal/e-cal-types.h
@@ -56,8 +56,7 @@ typedef enum {
        E_CALENDAR_STATUS_URI_NOT_LOADED,
        E_CALENDAR_STATUS_URI_ALREADY_LOADED,
        E_CALENDAR_STATUS_PERMISSION_DENIED,
-       E_CALENDAR_STATUS_CARD_NOT_FOUND,
-       E_CALENDAR_STATUS_CARD_ID_ALREADY_EXISTS,
+       E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS,
        E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED,
        E_CALENDAR_STATUS_CANCELLED,
        E_CALENDAR_STATUS_COULD_NOT_CANCEL,

diff --git a/calendar/libecal/e-cal-view-listener.c b/calendar/libecal/e-cal-view-listener.c
index db04bc3..fcaa2d3 100644 (file)
--- a/calendar/libecal/e-cal-view-listener.c
+++ b/calendar/libecal/e-cal-view-listener.c
@@ -61,8 +61,8 @@ convert_status (const GNOME_Evolution_Calendar_CallStatus status)
                return E_CALENDAR_STATUS_PERMISSION_DENIED;
        case GNOME_Evolution_Calendar_ObjectNotFound:
                return E_CALENDAR_STATUS_OBJECT_NOT_FOUND;
-       case GNOME_Evolution_Calendar_CardIdAlreadyExists:
-               return E_CALENDAR_STATUS_CARD_ID_ALREADY_EXISTS;
+       case GNOME_Evolution_Calendar_ObjectIdAlreadyExists:
+               return E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS;
        case GNOME_Evolution_Calendar_AuthenticationFailed:
                return E_CALENDAR_STATUS_AUTHENTICATION_FAILED;
        case GNOME_Evolution_Calendar_AuthenticationRequired:

diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 62498da..b725b31 100644 (file)
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -1552,7 +1552,7 @@ e_cal_open_async (ECal *ecal, gboolean only_if_exists)
 }
 
 gboolean 
-e_cal_remove_calendar (ECal *ecal, GError **error)
+e_cal_remove (ECal *ecal, GError **error)
 {
        ECalPrivate *priv;
        CORBA_Environment ev;
@@ -3882,9 +3882,7 @@ e_cal_get_error_message (ECalendarStatus status)
                return _("URI already loaded");
        case E_CALENDAR_STATUS_PERMISSION_DENIED :
                return _("Permission denied");
-       case E_CALENDAR_STATUS_CARD_NOT_FOUND :
-               return _("Object not found");
-       case E_CALENDAR_STATUS_CARD_ID_ALREADY_EXISTS :
+       case E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS :
                return _("Object ID already exists");
        case E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED :
                return _("Protocol not supported");

diff --git a/calendar/libecal/e-cal.h b/calendar/libecal/e-cal.h
index 77ba351..9c7faa1 100644 (file)
--- a/calendar/libecal/e-cal.h
+++ b/calendar/libecal/e-cal.h
@@ -107,7 +107,7 @@ void e_cal_set_auth_func (ECal *ecal, ECalAuthFunc func, gpointer data);
 
 gboolean e_cal_open (ECal *ecal, gboolean only_if_exists, GError **error);
 void e_cal_open_async (ECal *ecal, gboolean only_if_exists);
-gboolean e_cal_remove_calendar (ECal *ecal, GError **error);
+gboolean e_cal_remove (ECal *ecal, GError **error);
 
 GList *e_cal_uri_list (ECal *ecal, CalMode mode);