diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2003-04-27 00:44:49 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2003-04-27 00:44:49 +0800 |
| commit | da12dd29a85fae5e4ebaffcfb9c40fa6068ec55d (patch) | |
| tree | 90800ebe3c35b148eb0c1c7a537ebbc13835f7c9 /calendar/gui | |
| parent | 49802408e28d3f3938fd9c6c8c7c36a499277983 (diff) | |
| download | gsoc2013-evolution-da12dd29a85fae5e4ebaffcfb9c40fa6068ec55d.tar.gz gsoc2013-evolution-da12dd29a85fae5e4ebaffcfb9c40fa6068ec55d.tar.zst gsoc2013-evolution-da12dd29a85fae5e4ebaffcfb9c40fa6068ec55d.zip | |
Fixes #41661
2003-04-24 Rodrigo Moya <rodrigo@ximian.com>
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
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index bf59a4312b..9aff1a8bf0 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -219,12 +219,10 @@ remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id, cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l); g_slist_free_1 (l); - if (remove_alarm && - cal_client_get_static_capability (cqa->parent_client->client, - CAL_STATIC_CAPABILITY_REMOVE_ALARMS)) { - cal_component_remove_alarm (cqa->alarms->comp, qa->instance->auid); + if (remove_alarm) { cqa->expecting_update = TRUE; - cal_client_update_object (cqa->parent_client->client, cqa->alarms->comp); + cal_client_discard_alarm (cqa->parent_client->client, cqa->alarms->comp, + qa->instance->auid); cqa->expecting_update = FALSE; } |