qtorganizer5-eds

Merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1424924 into lp://qastaging/qtorganizer5-eds

fix-1424924
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2015-02-26

Status:

Merged

Approved by:

Timo Jyrinki on 2015-03-02

Approved revision:

Merged at revision:

Proposed branch:

lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1424924

Merge into:

lp://qastaging/qtorganizer5-eds

Diff against target:

116 lines (+94/-1)

2 files modified

organizer/qorganizer-eds-engine.cpp (+1/-1)
tests/unittest/recurrence-test.cpp (+93/-0)

To merge this branch:

bzr merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1424924

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-02-27
Charles Kerr (community)		2015-02-26	Approve on 2015-02-27
Review via email: mp+251129@code.qastaging.launchpad.net

Commit message

Use '0' as value for recurrence count if this is unset.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-26:

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/194/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/194/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2015-02-27:

LGTM.

The relevant EDS logic is in calendar/libecal/e-cal-recur.c; e.g. e_cal_recur_obtain_enddate()
which reasons that an event recurs forever if neither COUNT nor UNTIL are set.

So it makes sense for QOrganizerRecurrenceRule::NoLimit to be translated to
icalrecurrencetype.count==0 instead of
icalrecurrencetype.count==ICAL_RECURRENCE_ARRAY_MAX.