Merge lp:~binli/ubuntu/trusty/unity-control-center/unity-control-center.lp1248720-block-power-callback-unless-its-triggered-by-user into lp:unity-control-center/14.04
Proposed by
Bin Li
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sebastien Bacher | ||||
Approved revision: | 12783 | ||||
Merged at revision: | 12783 | ||||
Proposed branch: | lp:~binli/ubuntu/trusty/unity-control-center/unity-control-center.lp1248720-block-power-callback-unless-its-triggered-by-user | ||||
Merge into: | lp:unity-control-center/14.04 | ||||
Diff against target: |
87 lines (+26/-0) 2 files modified
debian/changelog (+7/-0) panels/bluetooth/cc-bluetooth-panel.c (+19/-0) |
||||
To merge this branch: | bzr merge lp:~binli/ubuntu/trusty/unity-control-center/unity-control-center.lp1248720-block-power-callback-unless-its-triggered-by-user | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
Review via email: mp+270924@code.launchpad.net |
Description of the change
Cheery pick from lp:unity-control-center.
To post a comment you must log in.
revno: 12815 [merge] center
author: Yu Ning <email address hidden>
committer: CI Train Bot <email address hidden>
branch nick: unity-control-
timestamp: Fri 2015-04-10 14:09:34 +0000
message:
Block power callback unless it's triggered by the user. Fixes: #1248720
Approved by: Sebastien Bacher, Lars Uebernickel