Author: bklaas
Date: Tue Feb 8 11:35:28 2011
New Revision: 9310
URL: http://svn.slimdevices.com/jive?rev=9310&view=rev
Log:
Fix merge error from 7.6/trunk in new-setup branch
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9310&r1=9309&r2=9310&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Tue Feb 8 11:35:28 2011
@@ -219,6 +219,13 @@
end
+function isSetupDone(self)
+ local settings = self:getSettings()
+
+ return settings and settings.setupDone
+end
+
+
function _setupDone(self, setupDone)
log:info("network setup complete")
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9310&r1=9309&r2=9310&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Tue Feb 8 11:35:28 2011
@@ -221,6 +221,14 @@
end
+
+function isSetupDone(self)
+ local settings = self:getSettings()
+
+ return settings and settings.setupDone
+end
+
+
function _setupDone(self, setupDone)
log:info("network setup complete")
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9310&r1=9309&r2=9310&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Tue Feb 8 11:35:28 2011
@@ -310,6 +310,13 @@
end
+function isSetupDone(self)
+ local settings = self:getSettings()
+
+ return settings and settings.setupDone
+end
+
+
function _setupDone(self, setupDone)
log:info("network setup complete")
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
