From 418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Sat, 16 May 1998 00:52:33 +0000 Subject: Bug free version of the range computation in place. 1998-05-15 Miguel de Icaza * gnome-cal.c (mark_gtk_calendar_day): Bug free version of the range computation in place. * gncal-year-view.c (year_view_mark_day): Use the same new version of the range computation here. * calobj.c (ical_object_generate_events): Fix the begin/end condition. svn path=/trunk/; revision=215 --- calendar/pcs/calobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/pcs') diff --git a/calendar/pcs/calobj.c b/calendar/pcs/calobj.c index 7b9b42b716..1a9ef3f206 100644 --- a/calendar/pcs/calobj.c +++ b/calendar/pcs/calobj.c @@ -1049,8 +1049,8 @@ ical_object_generate_events (iCalObject *ico, time_t start, time_t end, calendar int first_week_day, i; if (!ico->recur){ - if (time_in_range (ico->dtstart, start, end) || - time_in_range (ico->dtend, start, end)){ + if ((end && (ico->dtstart < end) && ico->dtend > start) || + (end == 0 && ico->dtend > start)){ time_t ev_s, ev_e; ev_s = ico->dtstart < start ? start : ico->dtstart; -- cgit