Merge lp:~charlesk/indicator-datetime/lp-1465806-inject-missing-triggers-to-clock-app-alarms into lp:indicator-datetime/15.04
Proposed by
Charles Kerr
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ted Gould | ||||
Approved revision: | 417 | ||||
Merged at revision: | 416 | ||||
Proposed branch: | lp:~charlesk/indicator-datetime/lp-1465806-inject-missing-triggers-to-clock-app-alarms | ||||
Merge into: | lp:indicator-datetime/15.04 | ||||
Diff against target: |
374 lines (+321/-2) 5 files modified
src/engine-eds.cpp (+135/-2) tests/CMakeLists.txt (+1/-0) tests/print-to.h (+24/-0) tests/test-eds-ics-missing-trigger.cpp (+116/-0) tests/test-eds-ics-missing-trigger.ics (+45/-0) |
||||
To merge this branch: | bzr merge lp:~charlesk/indicator-datetime/lp-1465806-inject-missing-triggers-to-clock-app-alarms | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+262297@code.launchpad.net |
Commit message
Fix invalid valarms in older clock-app alarms.
Description of the change
When we connect to an EClient, look for clock-app alarms whose valarms don't have triggers. If any are found, inject one.
To post a comment you must log in.
PASSED: Continuous integration, rev:417 jenkins. qa.ubuntu. com/job/ indicator- datetime- 15.04-ci/ 3/ jenkins. qa.ubuntu. com/job/ indicator- datetime- 15.04-vivid- amd64-ci/ 3 jenkins. qa.ubuntu. com/job/ indicator- datetime- 15.04-vivid- armhf-ci/ 3 jenkins. qa.ubuntu. com/job/ indicator- datetime- 15.04-vivid- armhf-ci/ 3/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- 15.04-ci/ 3/rebuild
http://