aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 6212099647..88fc98ea19 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-21 JP Rosevear <jpr@novell.com>
+
+ Fixes #41624
+
+ * conduits/calendar/calendar-conduit.c (local_record_from_comp):
+ append the exceptions, don't keep overwriting the first
+
2004-12-21 Rodrigo Moya <rodrigo@novell.com>
* gui/e-cal-model.c (set_instance_times): no need to convert times now.
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 7f47140196..b3c1b5e553 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -960,7 +960,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
icaltimezone_convert_time (dt->value,
icaltimezone_get_utc_timezone (),
default_tz);
- *local->appt->exception = icaltimetype_to_tm (dt->value);
+ local->appt->exception[i] = icaltimetype_to_tm (dt->value);
}
e_cal_component_free_exdate_list (edl);
}