Network Menu

Merge lp:~indicator-applet-developers/indicator-network/lp1237357 into lp:indicator-network/13.10

  1. lp1237357
  2. Merge into trunk.13.10
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: Ted Gould
Approved revision: 307
Merged at revision: 306
Proposed branch: lp:~indicator-applet-developers/indicator-network/lp1237357
Merge into: lp:indicator-network/13.10
Diff against target: 12 lines (+1/-1)
1 file modified
network/network-action-manager.vala (+1/-1)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-network/lp1237357
Reviewer Review Type Date Requested Status
Pete Woods (community) Approve
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+191218@code.launchpad.net

Commit message

Fix root icon when connected to WPA2-only or WEP AP. Fixes: https://bugs.launchpad.net/bugs/1237357.

To post a comment you must log in.
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

The code was using get_wpa_flags() which only returns WPA1 related flags. So the lock icon would not show on WEP or WPA2 APs.

Revision history for this message
Pete Woods (pete-woods) wrote :

This looks better. I am unfortunately somewhat familiar with those damn flags.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:306
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/77/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-network-ci/87/rebuild

review: Approve (continuous-integration)
lp:~indicator-applet-developers/indicator-network/lp1237357 updated
307. By Antti Kaijanmäki

fix the flag test.

Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
Pete Woods (pete-woods) wrote :

Better still. Glad ted spotted that. I usually do tests of the form (value & flag) == flag, but that's probably over the top.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'network/network-action-manager.vala'
2--- network/network-action-manager.vala 2013-10-14 17:53:48 +0000
3+++ network/network-action-manager.vala 2013-10-15 15:33:19 +0000
4@@ -427,7 +427,7 @@
5
6 if (act_ap != null) {
7 strength = act_ap.strength;
8- secure = act_ap.get_wpa_flags() != 0;
9+ secure = ((act_ap.get_flags() & NM.80211ApFlags.PRIVACY) != 0);
10 }
11
12 if (secure) {

Subscribers

People subscribed via source and target branches

to all changes: