Author: fmueller
Date: Fri Mar 23 03:06:02 2012
New Revision: 9675
URL: http://svn.slimdevices.com/jive?rev=9675&view=rev
Log:
Bug: n/a
Description: Network setup changes
- Disable WPS (for now)
Modified:
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Modified:
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua?rev=9675&r1=9674&r2=9675&view=diff
==============================================================================
---
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
(original)
+++
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Fri Mar 23 03:06:02 2012
@@ -733,10 +733,13 @@
self.encryption = "none"
return _connect(self, iface, ssid, true, false)
- -- FIXME: 08/31/09 Re-enable WPS for Controller at a later stage (after
more testing is done)
- elseif nocheck ~= "wps" and string.find(flags, "WPS") and
System:getMachine() ~= "jive" then
- self.encryption = "wpa2"
- return _chooseWPS(self, iface, ssid)
+-- fm+
+-- Disable WPS until the UX team has figured out how the correct wording
should be
+-- -- FIXME: 08/31/09 Re-enable WPS for Controller at a later stage (after
more testing is done)
+-- elseif nocheck ~= "wps" and string.find(flags, "WPS") and
System:getMachine() ~= "jive" then
+-- self.encryption = "wpa2"
+-- return _chooseWPS(self, iface, ssid)
+-- fm-
elseif string.find(flags, "WPA2%-PSK") then
self.encryption = "wpa2"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
