Merge lp://qastaging/~charlesk/indicator-bluetooth/lp-1236249 into lp://qastaging/indicator-bluetooth/13.10
Proposed by
Charles Kerr
| Status: | Merged |
|---|---|
| Approved by: | Ted Gould |
| Approved revision: | 73 |
| Merged at revision: | 70 |
| Proposed branch: | lp://qastaging/~charlesk/indicator-bluetooth/lp-1236249 |
| Merge into: | lp://qastaging/indicator-bluetooth/13.10 |
| Diff against target: |
422 lines (+133/-84) 8 files modified
src/bluetooth.vala (+8/-41) src/bluez.vala (+108/-26) src/desktop.vala (+2/-6) src/killswitch.vala (+7/-0) src/main.vala (+1/-1) src/org-bluez.vala (+1/-1) src/phone.vala (+1/-1) src/profile.vala (+5/-8) |
| To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-bluetooth/lp-1236249 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ted Gould (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
When the user chooses to toggle bluetooth on or off, if /dev/rfkill isn't available, fall back to toggling org.bluez.Adapter's Powered property.
Description of the change
* Use org.bluez.Adapter's Powered property to toggle bluetooth on and off. Skip /dev/rfkill entirely for 13.10, there are issues there that can't be resolved in time for 13.10.
* Leave the killswitch /dev/rfkill code in the codebase, though disabled for now, because it's likely to return post-13.10
* Do a better job of monitoring the bluez Manager and Adapter for changes s.t. the indicator can update its own state appropriately.
See also https:/
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:73
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://