Merge lp://staging/~pete-woods/indicator-network/no-urfkill-on-desktop into lp://staging/indicator-network
Proposed by
Pete Woods
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 660 |
| Merged at revision: | 661 |
| Proposed branch: | lp://staging/~pete-woods/indicator-network/no-urfkill-on-desktop |
| Merge into: | lp://staging/indicator-network |
| Diff against target: |
3131 lines (+1539/-615) 40 files modified
data/org.freedesktop.hostname1.xml (+64/-0) src/indicator/CMakeLists.txt (+4/-1) src/indicator/factory.cpp (+26/-12) src/indicator/nmofono/flight-mode-toggle.h (+52/-0) src/indicator/nmofono/kill-switch.cpp (+0/-181) src/indicator/nmofono/kill-switch.h (+0/-65) src/indicator/nmofono/manager-impl.cpp (+51/-67) src/indicator/nmofono/manager-impl.h (+8/-4) src/indicator/nmofono/manager.h (+2/-0) src/indicator/nmofono/null-flight-mode-toggle.cpp (+49/-0) src/indicator/nmofono/null-flight-mode-toggle.h (+42/-0) src/indicator/nmofono/urfkill-flight-mode-toggle.cpp (+106/-0) src/indicator/nmofono/urfkill-flight-mode-toggle.h (+48/-0) src/indicator/nmofono/wifi/network-manager-wifi-toggle.cpp (+98/-0) src/indicator/nmofono/wifi/network-manager-wifi-toggle.h (+52/-0) src/indicator/nmofono/wifi/urfkill-wifi-toggle.cpp (+155/-0) src/indicator/nmofono/wifi/urfkill-wifi-toggle.h (+54/-0) src/indicator/nmofono/wifi/wifi-link-impl.cpp (+12/-12) src/indicator/nmofono/wifi/wifi-link-impl.h (+3/-2) src/indicator/nmofono/wifi/wifi-toggle.h (+66/-0) src/indicator/sections/quick-access-section.cpp (+4/-1) src/qdbus-stubs/CMakeLists.txt (+7/-0) src/qdbus-stubs/dbus-types.h (+5/-0) tests/CMakeLists.txt (+1/-1) tests/data/hostname1.py (+53/-0) tests/integration/CMakeLists.txt (+5/-1) tests/integration/indicator-network-test-base-desktop.cpp (+30/-0) tests/integration/indicator-network-test-base-desktop.h (+34/-0) tests/integration/indicator-network-test-base-phone.cpp (+32/-0) tests/integration/indicator-network-test-base-phone.h (+36/-0) tests/integration/indicator-network-test-base.cpp (+28/-4) tests/integration/indicator-network-test-base.h (+17/-2) tests/integration/test-connectivity-api-modem.cpp (+2/-2) tests/integration/test-connectivity-api-sim.cpp (+2/-2) tests/integration/test-connectivity-api-vpn.cpp (+2/-2) tests/integration/test-connectivity-api.cpp (+2/-2) tests/integration/test-indicator-desktop.cpp (+131/-0) tests/integration/test-indicator-phone.cpp (+253/-251) tests/integration/test-indicator-vpn.cpp (+2/-2) tests/unit/secret-agent/test-secret-agent.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~pete-woods/indicator-network/no-urfkill-on-desktop |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Kerr (community) | Approve | ||
| dobey (community) | Approve | ||
| unity-api-1-bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Use plain NetworkManager radio control on desktop, URFKill on phablet
- Split out register and setup methods for platform-specific additions in test base class.
- Add hostname1 DBus template for Systemd's hostname 1 interface.
Description of the change
Use plain NetworkManager radio control on desktop, URFKill on phablet
- Split out register and setup methods for platform-specific additions in test base class.
- Add hostname1 DBus template for Systemd's hostname 1 interface.
To post a comment you must log in.
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:660
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/