Author: richard
Date: Fri Feb 6 11:41:10 2009
New Revision: 4083
URL: http://svn.slimdevices.com?rev=4083&root=Jive&view=rev
Log:
r4...@harrypotter (orig r4080): richard | 2009-02-06 14:25:48 +0000
Bug: N/A
Description:
Be less verbose.
r4...@harrypotter (orig r4081): tom | 2009-02-06 17:11:18 +0000
Bug: N/A
Description:
return "unknown" for arch for osx/windows for now- using null caused applet
breakage
r4...@harrypotter (orig r4082): tom | 2009-02-06 17:13:41 +0000
Bug: N/A
Description:
"return to setup" was broken in certain cases, since setupwelcome was freed.
Now use service call to return to setup so that SetupWelcome is reloaded.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_osx.c
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_windows.c
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Feb 6 11:41:10 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3993
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4076
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4082
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua?rev=4083&root=Jive&r1=4082&r2=4083&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
Fri Feb 6 11:41:10 2009
@@ -629,7 +629,7 @@
--]]
function registerAction(self, actionName)
if (self.actions.byName[actionName]) then
- log:info("Action already registered, doing nothing: ",
actionName)
+ log:debug("Action already registered, doing nothing: ",
actionName)
return
end
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_osx.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_osx.c?rev=4083&root=Jive&r1=4082&r2=4083&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_osx.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_osx.c Fri
Feb 6 11:41:10 2009
@@ -58,7 +58,7 @@
char *platform_get_arch() {
// FIXME
- return NULL;
+ return "unknown";
}
void platform_init(lua_State *L) {
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_windows.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_windows.c?rev=4083&root=Jive&r1=4082&r2=4083&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_windows.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_windows.c
Fri Feb 6 11:41:10 2009
@@ -9,7 +9,7 @@
#include "jive.h"
#include <SDL_syswm.h>
-#include <intrin.h>
+#include <intrin.h>
#include <iphlpapi.h>
#ifndef WM_APPCOMMAND
@@ -88,7 +88,7 @@
char *platform_get_arch() {
// FIXME
- return NULL;
+ return "unknown";
}
void platform_init(lua_State *L) {
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=4083&root=Jive&r1=4082&r2=4083&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Fri Feb 6 11:41:10 2009
@@ -95,7 +95,8 @@
text = self:string("RETURN_TO_SETUP"),
weight = 2,
callback = function()
- self:step1()
+ --note: don't refer to self here since the applet wil
have been freed if this is being called
+ appletManager:callService("step1")
end
}
jiveMain:addItem(returnToSetup)
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=4083&root=Jive&r1=4082&r2=4083&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Fri Feb 6 11:41:10 2009
@@ -78,7 +78,8 @@
text = self:string("RETURN_TO_SETUP"),
weight = 2,
callback = function()
- self:step1()
+ --note: don't refer to self here since the applet wil
have been freed if this is being called
+ appletManager:callService("step1")
end
}
jiveMain:addItem(returnToSetup)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
