Author: titmuss
Date: Mon Jan 14 09:05:51 2008
New Revision: 1433
URL: http://svn.slimdevices.com?rev=1433&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fixes for setup bugs caused by recent changes.
Modified:
trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
Modified: trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/ui/Window.lua?rev=1433&root=Jive&r1=1432&r2=1433&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Window.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Window.lua Mon Jan 14 09:05:51 2008
@@ -488,9 +488,9 @@
--[[
-=head2 jive.ui.Popup:lowerWindow(widget)
-
-Returns the window beneath this popup.
+=head2 jive.ui.Window:lowerWindow(self)
+
+Returns the window beneath this window in the window stack.
=cut
--]]
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=1433&root=Jive&r1=1432&r2=1433&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Mon Jan 14 09:05:51 2008
@@ -98,6 +98,10 @@
-- schedule network scan
self.scanMenu:addTimer(2000, function()
+ -- only scan if this window is on
top, not under a transparent popup
+ if Framework.windowStack[1] ~=
window then
+ return
+ end
_scan(self)
end)
Modified: trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua?rev=1433&root=Jive&r1=1432&r2=1433&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
(original)
+++ trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua Mon Jan
14 09:05:51 2008
@@ -302,6 +302,9 @@
assert(self:request(request) == "OK\n", "wpa_cli failed:" ..
request)
end
+ -- Disconnect from existing network
+ self:t_disconnectNetwork()
+
-- Use select network to disable all other networks
request = 'SELECT_NETWORK ' .. id
assert(self:request(request) == "OK\n", "wpa_cli failed:" .. request)
@@ -377,6 +380,9 @@
log:warn("can't find network ", ssid)
return
end
+
+ -- Disconnect from existing network
+ self:t_disconnectNetwork()
local request = 'SELECT_NETWORK ' .. id
assert(self:request(request) == "OK\n", "wpa_cli failed:" .. request)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
