Switchboard Network Plug

Merge lp:~vikoadi/switchboard-plug-networking/hotspot-fixed into lp:~donadigo/switchboard-plug-networking/wifi-hotspot

  1. hotspot-fixed
  2. Merge into wifi-hotspot
Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Adam Bieńkowski
Approved revision: 143
Merged at revision: 141
Proposed branch: lp:~vikoadi/switchboard-plug-networking/hotspot-fixed
Merge into: lp:~donadigo/switchboard-plug-networking/wifi-hotspot
Diff against target: 27 lines (+3/-3)
1 file modified
src/Widgets/WifiInterface.vala (+3/-3)
To merge this branch: bzr merge lp:~vikoadi/switchboard-plug-networking/hotspot-fixed
Reviewer Review Type Date Requested Status
Adam Bieńkowski Approve
Review via email: mp+268052@code.launchpad.net

Commit message

* Use proper bitmask testing.

Description of the change

use proper bitmask testing

To post a comment you must log in.
Revision history for this message
Adam Bieńkowski (donadigo) wrote :

Thank you! It's now working properly!

review: Approve
Revision history for this message
Adam Bieńkowski (donadigo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/WifiInterface.vala'
2--- src/Widgets/WifiInterface.vala 2015-08-11 16:51:23 +0000
3+++ src/Widgets/WifiInterface.vala 2015-08-14 11:02:48 +0000
4@@ -343,7 +343,7 @@
5
6 string? mode = null;
7 var caps = wifi_device.get_capabilities ();
8- if (caps == NM.DeviceWifiCapabilities.AP) {
9+ if ((caps & NM.DeviceWifiCapabilities.AP) != 0) {
10 mode = NM.SettingWireless.MODE_AP;
11 } else {
12 mode = NM.SettingWireless.MODE_ADHOC;
13@@ -363,12 +363,12 @@
14 var setting_wireless_security = new NM.SettingWirelessSecurity ();
15
16 if (mode == NM.SettingWireless.MODE_AP) {
17- if (caps == NM.DeviceWifiCapabilities.RSN) {
18+ if ((caps & NM.DeviceWifiCapabilities.RSN) != 0) {
19 set_wpa_key (setting_wireless_security, key);
20 setting_wireless_security.add_proto ("rsn");
21 setting_wireless_security.add_pairwise ("ccmp");
22 setting_wireless_security.add_group ("ccmp");
23- } else if (caps == NM.DeviceWifiCapabilities.WPA) {
24+ } else if ((caps & NM.DeviceWifiCapabilities.WPA) != 0) {
25 set_wpa_key (setting_wireless_security, key);
26 setting_wireless_security.add_proto ("wpa");
27 setting_wireless_security.add_pairwise ("tkip");

Subscribers

People subscribed via source and target branches