Merge lp:~vikoadi/switchboard-plug-networking/hotspot-fixed into lp:~donadigo/switchboard-plug-networking/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
=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala 2015-08-11 16:51:23 +0000
+++ src/Widgets/WifiInterface.vala 2015-08-14 11:02:48 +0000
@@ -343,7 +343,7 @@
343343
344 string? mode = null;344 string? mode = null;
345 var caps = wifi_device.get_capabilities ();345 var caps = wifi_device.get_capabilities ();
346 if (caps == NM.DeviceWifiCapabilities.AP) {346 if ((caps & NM.DeviceWifiCapabilities.AP) != 0) {
347 mode = NM.SettingWireless.MODE_AP;347 mode = NM.SettingWireless.MODE_AP;
348 } else {348 } else {
349 mode = NM.SettingWireless.MODE_ADHOC;349 mode = NM.SettingWireless.MODE_ADHOC;
@@ -363,12 +363,12 @@
363 var setting_wireless_security = new NM.SettingWirelessSecurity ();363 var setting_wireless_security = new NM.SettingWirelessSecurity ();
364364
365 if (mode == NM.SettingWireless.MODE_AP) {365 if (mode == NM.SettingWireless.MODE_AP) {
366 if (caps == NM.DeviceWifiCapabilities.RSN) {366 if ((caps & NM.DeviceWifiCapabilities.RSN) != 0) {
367 set_wpa_key (setting_wireless_security, key);367 set_wpa_key (setting_wireless_security, key);
368 setting_wireless_security.add_proto ("rsn");368 setting_wireless_security.add_proto ("rsn");
369 setting_wireless_security.add_pairwise ("ccmp");369 setting_wireless_security.add_pairwise ("ccmp");
370 setting_wireless_security.add_group ("ccmp");370 setting_wireless_security.add_group ("ccmp");
371 } else if (caps == NM.DeviceWifiCapabilities.WPA) {371 } else if ((caps & NM.DeviceWifiCapabilities.WPA) != 0) {
372 set_wpa_key (setting_wireless_security, key);372 set_wpa_key (setting_wireless_security, key);
373 setting_wireless_security.add_proto ("wpa");373 setting_wireless_security.add_proto ("wpa");
374 setting_wireless_security.add_pairwise ("tkip");374 setting_wireless_security.add_pairwise ("tkip");

Subscribers

People subscribed via source and target branches