diff options
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/cal-util/cal-recur.c | 22 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 9 |
3 files changed, 23 insertions, 18 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0fbbdf3f4f..9a6b9e155e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,8 +1,16 @@ 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 + +2000-09-05 JP Rosevear <jpr@helixcode.com> + * gui/e-day-view.c (e_day_view_on_delete_occurrence): Append the exdate to the list AFTER we create the date value. - + 2000-09-05 JP Rosevear <jpr@helixcode.com> * cal-util/cal-component.c (cal_component_free_recur_list): Free 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); } diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index af15a79798..1f3808d695 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -2626,7 +2626,7 @@ e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data) EDayView *day_view; EDayViewEvent *event; CalComponent *comp; - CalComponentDateTime *date; + struct icaltimetype *time; GSList *list; day_view = E_DAY_VIEW (data); @@ -2639,10 +2639,9 @@ e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data) when we get the "update_event" callback. */ comp = cal_component_clone (event->comp); cal_component_get_exdate_list (comp, &list); - date = g_new0 (CalComponentDateTime, 1); - date->value = g_new (struct icaltimetype, 1); - *date->value = icaltime_from_timet (event->start, TRUE, FALSE); - list = g_slist_append (list, date); + time = g_new0 (struct icaltimetype, 1); + *time = icaltime_from_timet (event->start, FALSE, FALSE); + list = g_slist_append (list, time); cal_component_set_exdate_list (comp, list); cal_component_free_exdate_list (list); |