aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0083402378..abab644a57 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,10 @@
2003-04-10 Rodrigo Moya <rodrigo@ximian.com>
+ * gui/alarm-notify/alarm-queue.c (remove_queued_alarm): only remove
+ the alarm for backends that want it (Exchange).
+
+2003-04-10 Rodrigo Moya <rodrigo@ximian.com>
+
* cal-util/cal-util.h: added #define's for static capabilities.
* pcs/cal-backend-file.c (cal_backend_file_get_static_capabilities):
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index f2bac1bc3d..f117e53723 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -217,7 +217,9 @@ 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) {
+ 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);
cqa->expecting_update = TRUE;
cal_client_update_object (cqa->parent_client->client, cqa->alarms->comp);