From b0a6e1d4482499bbaa08238a8cb09b6f692556d6 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Thu, 6 Oct 2011 08:57:38 +0200 Subject: Pass item durations to recur_item_inday() Having item's durations eventually allows for better parsing of recurrent appointments as we might be interested in how many days are covered by a multi-day appointment. Signed-off-by: Lukas Fleischer --- src/recur.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/recur.c') diff --git a/src/recur.c b/src/recur.c index de2efff..b33144d 100644 --- a/src/recur.c +++ b/src/recur.c @@ -631,8 +631,8 @@ exc_inday (struct excp *exc, long day_start) * calculation of recurrent dates after a turn of years. */ unsigned -recur_item_inday (long item_start, llist_t *item_exc, int rpt_type, - int rpt_freq, long rpt_until, long day_start) +recur_item_inday (long item_start, long item_dur, llist_t *item_exc, + int rpt_type, int rpt_freq, long rpt_until, long day_start) { struct date start_date; long day_end, diff; @@ -708,15 +708,15 @@ recur_item_inday (long item_start, llist_t *item_exc, int rpt_type, unsigned recur_apoint_inday(struct recur_apoint *rapt, long day_start) { - return recur_item_inday (rapt->start, &rapt->exc, rapt->rpt->type, + return recur_item_inday (rapt->start, rapt->dur, &rapt->exc, rapt->rpt->type, rapt->rpt->freq, rapt->rpt->until, day_start); } unsigned recur_event_inday(struct recur_event *rev, long day_start) { - return recur_item_inday (rev->day, &rev->exc, rev->rpt->type, rev->rpt->freq, - rev->rpt->until, day_start); + return recur_item_inday (rev->day, DAYINSEC, &rev->exc, rev->rpt->type, + rev->rpt->freq, rev->rpt->until, day_start); } /* -- cgit v1.2.3-54-g00ecf