Merge lp://staging/~unity-api-team/indicator-network/handle-mesh-networks-14.09 into lp://staging/indicator-network/14.09
Proposed by
Pete Woods
| Status: | Merged |
|---|---|
| Approved by: | Pete Woods |
| Approved revision: | 475 |
| Merged at revision: | 475 |
| Proposed branch: | lp://staging/~unity-api-team/indicator-network/handle-mesh-networks-14.09 |
| Merge into: | lp://staging/indicator-network/14.09 |
| Diff against target: |
182 lines (+49/-13) 8 files modified
src/indicator/nmofono/kill-switch-impl.cpp (+9/-1) src/indicator/nmofono/wifi/access-point-impl.cpp (+2/-2) src/indicator/nmofono/wifi/access-point-impl.h (+2/-2) src/indicator/nmofono/wifi/access-point.h (+1/-1) src/indicator/nmofono/wifi/grouped-access-point-impl.cpp (+27/-2) src/indicator/nmofono/wifi/grouped-access-point-impl.h (+2/-2) src/indicator/root-state.cpp (+4/-0) tests/unit/indicator/menuitems/test-access-point-item.cpp (+2/-3) |
| To merge this branch: | bzr merge lp://staging/~unity-api-team/indicator-network/handle-mesh-networks-14.09 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Handle mesh networks without crashing
Description of the change
Handle mesh networks without crashing
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
