diff options
| author | JP Rosevear <jpr@novell.com> | 2004-05-28 14:06:45 +0000 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-05-28 14:06:45 +0000 |
| commit | e5b020ad14d96d99556d700a9e02a05bb1b04fc5 (patch) | |
| tree | 5a7713f2e8e136455247352db58785a9d93584f2 | |
| parent | 48d51993adf0e9e8e37f0380f92436e5e6529cd7 (diff) | |
| download | evolution-data-server-e5b020ad14d96d99556d700a9e02a05bb1b04fc5.tar.gz | |
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
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/backends/file/e-cal-backend-file.c | 6 | ||||
| -rw-r--r-- | calendar/libecal/e-cal-types.h | 1 | ||||
| -rw-r--r-- | calendar/libecal/e-cal.c | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index dc6b459fc..8b7e5b955 100644 --- 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 fed09e807..f7408cd05 100644 --- 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, ¤t); e_cal_component_set_last_modified (comp, ¤t); - /* 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 71798f02c..00a04b279 100644 --- 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 1cd513776..e5c25a823 100644 --- 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 : |