Fixes #55524

2004-05-28  JP Rosevear  <jpr@novell.com>

	Fixes #55524

	* backends/file/e-cal-backend-file.c
	(e_cal_backend_file_receive_objects): don't sanitize the
	component, we already check for valid timezones and the zones
	aren't merged in yet anyhow

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index dc6b459..8b7e5b9 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-28  JP Rosevear  <jpr@novell.com>
+
+       Fixes #55524
+       
+       * backends/file/e-cal-backend-file.c
+       (e_cal_backend_file_receive_objects): don't sanitize the
+       component, we already check for valid timezones and the zones
+       aren't merged in yet anyhow
+
 2004-05-28  Rodrigo Moya <rodrigo@novell.com>
 
        * libedata-cal/e-data-cal-factory.c (backend_last_client_gone_cb):

diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index fed09e8..f7408cd 100644 (file)
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -2119,10 +2119,6 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, EDataCal *cal, con
                e_cal_component_set_created (comp, &current);
                e_cal_component_set_last_modified (comp, &current);
 
-               /* sanitize the component*/
-               /* XFFIXME We already checked for the timezones above */
-               sanitize_component (cbfile, comp); 
-
                e_cal_component_get_uid (comp, &uid);
                rid = e_cal_component_get_recurid_as_string (comp);
 
@@ -2150,6 +2146,8 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, EDataCal *cal, con
                        break;
                case ICAL_METHOD_ADD:
                        /* FIXME This should be doable once all the recurid stuff is done */
+                       status = GNOME_Evolution_Calendar_UnsupportedMethod;
+                       goto error;
                        break;
                case ICAL_METHOD_COUNTER:
                        status = GNOME_Evolution_Calendar_UnsupportedMethod;

diff --git a/calendar/libecal/e-cal-types.h b/calendar/libecal/e-cal-types.h
index 71798f0..00a04b2 100644 (file)
--- a/calendar/libecal/e-cal-types.h
+++ b/calendar/libecal/e-cal-types.h
@@ -62,6 +62,7 @@ typedef enum {
        E_CALENDAR_STATUS_COULD_NOT_CANCEL,
        E_CALENDAR_STATUS_AUTHENTICATION_FAILED,
        E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED,
+       E_CALENDAR_STATUS_UNABLE_TO_BOOK,
        E_CALENDAR_STATUS_CORBA_EXCEPTION,
        E_CALENDAR_STATUS_OTHER_ERROR
 } ECalendarStatus;

diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 1cd5137..e5c25a8 100644 (file)
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -4274,6 +4274,8 @@ e_cal_get_error_message (ECalendarStatus status)
                return _("Authentication failed");
        case E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED :
                return _("Authentication required");
+       case E_CALENDAR_STATUS_UNABLE_TO_BOOK :
+               return _("Unable to book time");
        case E_CALENDAR_STATUS_CORBA_EXCEPTION :
                return _("A CORBA exception has occurred");
        case E_CALENDAR_STATUS_OTHER_ERROR :