Merge lp:~charlesk/indicator-datetime/lp-1387231-honor-x-canonical-disabled-tag into lp:indicator-datetime/rtm-14.09
Status: | Merged |
---|---|
Approved by: | Ted Gould |
Approved revision: | 389 |
Merged at revision: | 387 |
Proposed branch: | lp:~charlesk/indicator-datetime/lp-1387231-honor-x-canonical-disabled-tag |
Merge into: | lp:indicator-datetime/rtm-14.09 |
Diff against target: |
373 lines (+65/-40) 14 files modified
debian/changelog (+7/-0) include/datetime/appointment.h (+4/-1) src/actions-live.cpp (+1/-1) src/appointment.cpp (+3/-3) src/engine-eds.cpp (+19/-3) src/menu.cpp (+4/-4) src/snap.cpp (+0/-6) tests/manual (+15/-10) tests/manual-test-snap.cpp (+1/-1) tests/test-actions.cpp (+2/-2) tests/test-alarm-queue.cpp (+2/-2) tests/test-live-actions.cpp (+2/-2) tests/test-menus.cpp (+4/-4) tests/test-snap.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~charlesk/indicator-datetime/lp-1387231-honor-x-canonical-disabled-tag |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
Review via email: mp+244251@code.launchpad.net |
Commit message
Add support for x-canonical-alarm and x-canonical-
Description of the change
Same MP as proposed for Vivid @ https:/
Description of the Change
=======
This culls the fix for bug #1387231 from my development branch so that it's easier to review and to backport in isolation.
This piece adds support for noticing the x-canonical-alarm and x-canonical-
Checklist
=========
> Are there any related MPs required for this MP to build/function as expected? Please list.
No
> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)
Yes
> Did the code build without warnings?
Yes
> Did the tests run successfully?
Yes
> Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
> What device (or emulator) has your component test plan been executed successfully on?
Krillin running ubuntu-
> What manual tests are relevant for this MP?
indicator-
> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?
https:/