Merge lp:~pete-woods/indicator-network/wapi-lp1597681 into lp:indicator-network
Proposed by
Pete Woods
Status: | Approved | ||||
---|---|---|---|---|---|
Approved by: | Pete Woods | ||||
Approved revision: | 609 | ||||
Proposed branch: | lp:~pete-woods/indicator-network/wapi-lp1597681 | ||||
Merge into: | lp:indicator-network | ||||
Diff against target: |
531 lines (+187/-139) 12 files modified
po/indicator-network.pot (+126/-122) src/agent/SecretAgent.h (+1/-0) src/agent/SecretRequest.cpp (+5/-2) src/indicator/menuitems/access-point-item.cpp (+1/-1) src/indicator/nmofono/wifi/access-point-impl.cpp (+18/-2) src/indicator/nmofono/wifi/access-point-impl.h (+1/-1) src/indicator/nmofono/wifi/access-point.h (+10/-1) src/indicator/nmofono/wifi/grouped-access-point.cpp (+3/-3) src/indicator/nmofono/wifi/grouped-access-point.h (+1/-1) src/indicator/nmofono/wifi/wifi-link-impl.cpp (+18/-4) tests/integration/test-indicator.cpp (+1/-1) tests/unit/indicator/menuitems/test-access-point-item.cpp (+2/-1) |
||||
To merge this branch: | bzr merge lp:~pete-woods/indicator-network/wapi-lp1597681 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Indicator Applet Developers | Pending | ||
Review via email: mp+299577@code.launchpad.net |
Commit message
Add support for new WAPI settings keys
Description of the change
Add support for new WAPI settings keys
To post a comment you must log in.
Unmerged revisions
- 610. By Pete Woods
-
Log which URLs are dispatched to USS
- 609. By Pete Woods
-
Add support for new WAPI settings keys