Author: bklaas
Date: Mon Jun 23 14:40:12 2008
New Revision: 2617
URL: http://svn.slimdevices.com?rev=2617&root=Jive&view=rev
Log:
Bug: n/a
Description: misc fixes to applet and meta files in an attempt to get them to
show up again
SetupAppletInstaller is broken via desktop jive for me ('zipfilter' undefined)
SetupNetTest is broken due to SlimDiscovery refactoring (bug 8539)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua?rev=2617&root=Jive&r1=2616&r2=2617&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
Mon Jun 23 14:40:12 2008
@@ -43,7 +43,7 @@
end
function notify_playerCurrent(self, player)
- if player == nil or player:getSlimServer():isSqueezeNetwork() then
+ if player == nil or ( player:getSlimServer() and
player:getSlimServer():isSqueezeNetwork() ) then
jiveMain:removeItem(self.menu)
else
jiveMain:addItem(self.menu)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua?rev=2617&root=Jive&r1=2616&r2=2617&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
Mon Jun 23 14:40:12 2008
@@ -42,6 +42,7 @@
local EVENT_UNUSED = jive.ui.EVENT_UNUSED
local EVENT_ACTION = jive.ui.EVENT_ACTION
+local appletManager = appletManager
module(...)
oo.class(_M, Applet)
@@ -284,4 +285,5 @@
function free(self)
self.timer:stop()
self:stopTest()
-end
+end
+
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua?rev=2617&root=Jive&r1=2616&r2=2617&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
Mon Jun 23 14:40:12 2008
@@ -28,15 +28,17 @@
jnt:subscribe(meta)
meta.menu = meta:menuItem('appletSetupNetTest', 'advancedSettings',
meta:string('SETUPNETTEST'), function(applet, ...) applet:open(...) end, 100)
+ jiveMain:addItem(meta.menu)
jiveMain:loadSkin("SetupNetTest", "skin")
end
function notify_playerCurrent(meta, player)
- if player == nil or player:getSlimServer():isSqueezeNetwork() then
+ if player == nil or ( player:getSlimServer() and
player:getSlimServer():isSqueezeNetwork() ) then
jiveMain:removeItem(meta.menu)
else
jiveMain:addItem(meta.menu)
end
-end
+end
+
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
