From da12dd29a85fae5e4ebaffcfb9c40fa6068ec55d Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Sat, 26 Apr 2003 16:44:49 +0000 Subject: Fixes #41661 2003-04-24 Rodrigo Moya Fixes #41661 * idl/evolution-calendar.idl: added discardAlarm method to GNOME:Evolution:Calendar:Cal interface. * pcs/cal.c (cal_class_init): set new epv's method. (impl_Cal_discardAlarm): implementation of new CORBA method. * pcs/cal-backend.[ch]: added 'discard_alarm' virtual method, and CAL_BACKEND_RESULT_NOT_IMPLEMENTED to CalBackendResult enum. (cal_backend_class_init): initialize new class method. (cal_backend_discard_alarm): new method. (cal_backend_update_objects, cal_backend_remove_object): return proper CalBackendResult values. * pcs/cal-backend-file.c (cal_backend_file_class_init): initialize new class method. (cal_backend_file_discard_alarm): implementation of new method. * pcs/cal-client.[ch] (cal_client_discard_alarm): new function. * gui/alarm-notify/alarm-queue.c (remove_qeueud_alarm): don't remove the alarm directly from the component, call cal_client_discard_alarm and let the backend deal with it. svn path=/trunk/; revision=20973 --- calendar/pcs/cal-backend.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'calendar/pcs/cal-backend.h') diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h index 962b468fc3..49d8b2d76e 100644 --- a/calendar/pcs/cal-backend.h +++ b/calendar/pcs/cal-backend.h @@ -47,7 +47,7 @@ typedef enum { CAL_BACKEND_OPEN_SUCCESS, /* Loading OK */ CAL_BACKEND_OPEN_ERROR, /* We need better error reporting in libversit */ CAL_BACKEND_OPEN_NOT_FOUND, - CAL_BACKEND_OPEN_PERMISSION_DENIED + CAL_BACKEND_OPEN_PERMISSION_DENIED, } CalBackendOpenStatus; /* Update and Remove result values */ @@ -137,6 +137,7 @@ struct _CalBackendClass { GNOME_Evolution_Calendar_CalComponentAlarms *(* get_alarms_for_object) ( CalBackend *backend, const char *uid, time_t start, time_t end, gboolean *object_found); + CalBackendResult (* discard_alarm) (CalBackend *backend, const char *uid, const char *auid); /* Object manipulation virtual methods */ CalBackendResult (* update_objects) (CalBackend *backend, const char *calobj, CalObjModType mod); @@ -210,6 +211,8 @@ GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_get_alarms_for_object ( time_t start, time_t end, CalBackendGetAlarmsForObjectResult *result); +CalBackendResult cal_backend_discard_alarm (CalBackend *backend, const char *uid, const char *auid); + CalBackendResult cal_backend_update_objects (CalBackend *backend, const char *calobj, CalObjModType mod); -- cgit v1.2.3