Author: titmuss
Date: Fri Feb 8 16:01:07 2008
New Revision: 1875
URL: http://svn.slimdevices.com?rev=1875&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1870): titmuss | 2008-02-08 18:05:26 +0000
Bug: 6580
Description:
Minor fixes.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Feb 8 16:01:07 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1864
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1870
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=1875&root=Jive&r1=1874&r2=1875&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Fri Feb 8 16:01:07 2008
@@ -831,7 +831,9 @@
-- start timer to resume this task every second
self.suspendPopup:addTimer(1000,
function()
- self.suspendTask:addTask()
+ if self.suspendTask then
+ self.suspendTask:addTask()
+ end
end)
while true do
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt?rev=1875&root=Jive&r1=1874&r2=1875&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
Fri Feb 8 16:01:07 2008
@@ -238,3 +238,10 @@
IT Annullare o confermare la disattivazione del telecomando
NL Annuleer of bevestig het uitzetten van je controller
+PLEASE_WAIT
+ DE Verbindung
+ EN Please wait
+ ES Conectando
+ FR Connexion
+ IT Connessione...
+ NL Bezig met verbinden
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=1875&root=Jive&r1=1874&r2=1875&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 Fri Feb
8 16:01:07 2008
@@ -624,7 +624,7 @@
table.insert(self.responseQueue, task)
local _, reply, err = Task:yield(false)
- if err then
+ if not reply or err then
log:warn(err)
self:close()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
