aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog1
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 3d42520f57..a15d13bbd0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -2,6 +2,7 @@
* gui/alarm-notify/alarm-queue.c (load_alarms): call e_cal_view_start
to actually start the live query.
+ (add_component_alarms): check the 'alarms' parameter before using it.
2004-01-07 Rodrigo Moya <rodrigo@ximian.com>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 62c1a0a3fd..15940e7de8 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -323,8 +323,9 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
GSList *l;
/* No alarms? */
- if (alarms->alarms == NULL) {
- e_cal_component_alarms_free (alarms);
+ if (alarms == NULL || alarms->alarms == NULL) {
+ if (alarms)
+ e_cal_component_alarms_free (alarms);
return;
}