Skip to content
This repository has been archived by the owner on Nov 11, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
[kcalcore] Fix timezone rrule. Contributes to JB#48733
Similar to upstream
https://phabricator.kde.org/R172:595d25ddbc6838eb7ec70a71040246f4c7c5426f

"libical 3.0.6 is stricter for RRULEs than previous versions and disallows
setting both the COUNT and UNTIL property at the same time. So don't do
that anymore, one is enough."

Test side changes omitted.
  • Loading branch information
pvuorela committed Jan 29, 2020
1 parent ed7a28b commit 81c0fc4
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion kcalcore/icaltimezones.cpp
Expand Up @@ -711,7 +711,6 @@ ICalTimeZoneData::ICalTimeZoneData( const KTimeZoneData &rhs,
icalrecurrencetype r;
icalrecurrencetype_clear( &r );
r.freq = ICAL_YEARLY_RECURRENCE;
r.count = ( year >= 2030 ) ? 0 : times.count() - 1;
r.by_month[0] = month;
if ( rule & DAY_OF_MONTH ) {
r.by_month_day[0] = dayOfMonth;
Expand Down

0 comments on commit 81c0fc4

Please sign in to comment.