Merge lp:~ted/indicator-network/blank-items into lp:indicator-network/13.10
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Charles Kerr | ||||||||
Approved revision: | 304 | ||||||||
Merged at revision: | 294 | ||||||||
Proposed branch: | lp:~ted/indicator-network/blank-items | ||||||||
Merge into: | lp:indicator-network/13.10 | ||||||||
Diff against target: |
226 lines (+107/-14) 5 files modified
network/CMakeLists.txt (+3/-0) network/device-wifi.vala (+49/-14) network/util-wrapper.c (+30/-0) network/util-wrapper.h (+20/-0) network/util-wrapper.vapi (+5/-0) |
||||||||
To merge this branch: | bzr merge lp:~ted/indicator-network/blank-items | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
Sebastien Bacher | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Ensure APs with SSIDs we don't want to show aren't shown
Description of the change
This change reshuffles the AP handling a little bit in that we're looking at each item that we're creating, and possibily rejecting the menu item getting created at all. But, because there is some amount of uncertainty here, we need to track each and ensure that if the SSID updates to something valid, we can then show it. So this branch makes sure to set up notification of that change, and then rejects anything we might see as suspect.
To use the NM Utils library we required a small wrapper there as the NM VAPI isn't quite clear on what it wants and I didn't want to force it. Making our own wrapper function made things a lot cleaner, even though it makes the diff much larger.
FAILED: Continuous integration, rev:303 jenkins. qa.ubuntu. com/job/ indicator- network- ci/70/ jenkins. qa.ubuntu. com/job/ indicator- network- saucy-amd64- ci/60 jenkins. qa.ubuntu. com/job/ indicator- network- saucy-armhf- ci/60/console
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/indicator- network- ci/70/rebuild
http://