Merge lp://staging/~pete-woods/indicator-network/add-ethernet-settings-export into lp://staging/indicator-network
Proposed by
Pete Woods
Status: | Approved |
---|---|
Approved by: | dobey |
Approved revision: | 672 |
Proposed branch: | lp://staging/~pete-woods/indicator-network/add-ethernet-settings-export |
Merge into: | lp://staging/indicator-network |
Prerequisite: | lp://staging/~pete-woods/indicator-network/clean-up-menu-exports |
Diff against target: |
389 lines (+101/-29) 14 files modified
src/indicator/factory.cpp (+6/-1) src/indicator/factory.h (+2/-0) src/indicator/menu-builder.cpp (+6/-0) src/indicator/menuitems/ethernet-item.cpp (+2/-2) src/indicator/menuitems/ethernet-item.h (+1/-1) src/indicator/menuitems/ethernet-link-item.cpp (+2/-2) src/indicator/menuitems/ethernet-link-item.h (+1/-1) src/indicator/sections/ethernet-link-section.cpp (+7/-4) src/indicator/sections/ethernet-link-section.h (+1/-1) src/indicator/sections/ethernet-section.cpp (+42/-16) src/indicator/sections/ethernet-section.h (+1/-1) tests/integration/indicator-network-test-base.cpp (+8/-0) tests/integration/indicator-network-test-base.h (+2/-0) tests/integration/test-indicator-phone.cpp (+20/-0) |
To merge this branch: | bzr merge lp://staging/~pete-woods/indicator-network/add-ethernet-settings-export |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
unity-api-1-bot | continuous-integration | Approve | |
Review via email: mp+320340@code.staging.launchpad.net |
Commit message
Add basic ethernet settings menu export
Description of the change
Add basic ethernet settings menu export
To post a comment you must log in.
Unmerged revisions
- 672. By Pete Woods
-
Add basic ethernet settings menu export
- 671. By Pete Woods
-
Only physically export a single "phone" and tweak the indicator config file so it's used everywhere
PASSED: Continuous integration, rev:672 /jenkins. canonical. com/unity- api-1/job/ lp-indicator- network- ci/40/ /jenkins. canonical. com/unity- api-1/job/ build/1837 /jenkins. canonical. com/unity- api-1/job/ build-0- fetch/1844 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1621 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1621/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/1621 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/1621/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1621 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1621/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/1621 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/1621/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1621 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1621/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/1621 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/1621/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/unity- api-1/job/ lp-indicator- network- ci/40/rebuild
https:/