diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1998-05-16 08:52:33 +0800 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-05-16 08:52:33 +0800 |
| commit | 418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8 (patch) | |
| tree | 7a78067e84f745f1db3fb1cfdcc015a0cb89e9bd /calendar/cal-util/calobj.c | |
| parent | 3799134926a1db309a2b46706d8a33581999f778 (diff) | |
| download | gsoc2013-evolution-418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8.tar gsoc2013-evolution-418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8.tar.gz gsoc2013-evolution-418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8.tar.bz2 gsoc2013-evolution-418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8.tar.lz gsoc2013-evolution-418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8.tar.xz gsoc2013-evolution-418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8.tar.zst gsoc2013-evolution-418f8bfcb52e54cdf88ef9b10c2cd185cd116fe8.zip | |
Bug free version of the range computation in place.
1998-05-15 Miguel de Icaza <miguel@nuclecu.unam.mx>
* 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
Diffstat (limited to 'calendar/cal-util/calobj.c')
| -rw-r--r-- | calendar/cal-util/calobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c index 7b9b42b716..1a9ef3f206 100644 --- a/calendar/cal-util/calobj.c +++ b/calendar/cal-util/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; |