From f45524172e1623484b6975ba99ce8c4321a230f3 Mon Sep 17 00:00:00 2001 From: "daniel.boelzle%sun.com" Date: Mon, 21 Jul 2008 07:38:34 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20446190=20=EF=BF=BD=EF=BF=BD=EF=BF=BD=20al?= =?UTF-8?q?arm=20service=20should=20mind=20disabled=20calendars;=20r=3Dphi?= =?UTF-8?q?lipp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calendar/base/public/calICalendar.idl | 3 ++- calendar/base/src/calAlarmService.js | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/calendar/base/public/calICalendar.idl b/calendar/base/public/calICalendar.idl index 92035982751..53189337a31 100644 --- a/calendar/base/public/calICalendar.idl +++ b/calendar/base/public/calICalendar.idl @@ -119,7 +119,8 @@ interface calICalendar : nsISupports * e.g. on the server or in local prefs. * * Currently known properties are: - * [boolean] calendar-main-in-composite + * [boolean] disabled + * [boolean] calendar-main-in-composite * [string] name * [boolean] readOnly * [boolean] requiresNetwork If false, the calendar does not require diff --git a/calendar/base/src/calAlarmService.js b/calendar/base/src/calAlarmService.js index c646fe72d30..1ca9b093224 100644 --- a/calendar/base/src/calAlarmService.js +++ b/calendar/base/src/calAlarmService.js @@ -75,9 +75,7 @@ function calAlarmService() { this.alarmService.notifyObservers("onRemoveAlarmsByCalendar", [calendar]); // a refreshed calendar signals that it has been reloaded // (and cannot notify detailed changes), thus reget all alarms of it: - if (!calendar.getProperty("disabled")) { - this.alarmService.initAlarms([calendar]); - } + this.alarmService.initAlarms([calendar]); } }, onAddItem: function(aItem) { @@ -581,7 +579,8 @@ calAlarmService.prototype = { for each(var calendar in calendars) { // assuming that suppressAlarms does not change anymore until refresh: if (!calendar.getProperty("suppressAlarms") && - calendar.getProperty("capabilities.alarms.popup.supported") !== false) { + (calendar.getProperty("capabilities.alarms.popup.supported") !== false) && + !calendar.getProperty("disabled")) { calendar.getItems(filter, 0, start, until, getListener); } }