The exdate and rdate lists are a list of icaltimetypes, not

2000-09-05  JP Rosevear  <jpr@helixcode.com>

	* cal-util/cal-recur.c (generate_instances_for_year): The exdate
	and rdate lists are a list of icaltimetypes, not
CalComponentPeriods

	*gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate
list
	is a list of icaltimetypes, not CalComponentDateTimes

svn path=/trunk/; revision=5211

1 files changed, 10 insertions, 12 deletions

diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
index cfd3011c0a..fd4d875d83 100644
--- a/calendar/cal-util/cal-recur.c
+++ b/calendar/cal-util/cal-recur.c
@@ -781,15 +781,14 @@ generate_instances_for_year (CalComponent	*comp,
 
 	/* Add on specific occurrence dates. */
 	for (elem = rdates; elem; elem = elem->next) {
-		CalComponentPeriod *period;
+		struct icaltimetype *it;
 		time_t t;
 
-		/* FIXME: this only deals with the start time */
-
-		period = elem->data;
-		t = icaltime_as_timet (period->start);
-
+		/* FIXME we should only be dealing with dates, not times too */
+		it = elem->data;
+		t = icaltime_as_timet (*it);
 		cal_object_time_from_time (&cotime, t);
+
 		g_array_append_val (occs, cotime);
 	}
 
@@ -812,15 +811,14 @@ generate_instances_for_year (CalComponent	*comp,
 
 	/* Add on specific exception dates. */
 	for (elem = exdates; elem; elem = elem->next) {
-		CalComponentPeriod *period;
+		struct icaltimetype *it;
 		time_t t;
 
-		/* FIXME: this only deals with the start time */
-
-		period = elem->data;
-		t = icaltime_as_timet (period->start);
-
+		/* FIXME we should only be dealing with dates, not times too */
+		it = elem->data;
+		t = icaltime_as_timet (*it);
 		cal_object_time_from_time (&cotime, t);
+
 		g_array_append_val (ex_occs, cotime);
 	}