Merge lp:~ralsina/ubuntu-system-settings/per-package-notifications-rtm into lp:ubuntu-system-settings/rtm-14.09
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 1007 |
Merged at revision: | 1010 |
Proposed branch: | lp:~ralsina/ubuntu-system-settings/per-package-notifications-rtm |
Merge into: | lp:ubuntu-system-settings/rtm-14.09 |
Diff against target: |
248 lines (+146/-37) 3 files modified
plugins/notifications/notification_manager.cpp (+88/-37) plugins/notifications/notification_manager.h (+1/-0) tests/autopilot/ubuntu_system_settings/tests/test_notifications.py (+57/-0) |
To merge this branch: | bzr merge lp:~ralsina/ubuntu-system-settings/per-package-notifications-rtm |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+254625@code.launchpad.net |
Commit message
Use per-package notification settings instead of per-app and per-scope.
Description of the change
------------
To test:
* Using the current ubuntu-
* Using this version you should have one.
* If you untick the telegram item, and run this command, you should see something like this:
$ gsettings get com.ubuntu.
[('com.
* Ticking the telegram item should make those two items disappear
-------------
Additionally, if either one of the telegram items were NOT ticked, then the single telegram item in the new version should be NOT ticked.
If any other app was ticked/not ticked with the current version, it should stay the same in the new version.
FAILED: Continuous integration, rev:1007 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- rtm-14. 09-ci/74/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- 14.09-touch/ 53 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- rtm-14. 09-14.09- armhf-ci/ 75 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- rtm-14. 09-14.09- armhf-ci/ 75/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- 14.09-mako/ 54 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- 14.09-armhf/ 53 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- 14.09-armhf/ 53/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 19278
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- rtm-14. 09-ci/74/ rebuild
http://