Author: titmuss
Date: Thu Jan 24 11:42:38 2008
New Revision: 1609
URL: http://svn.slimdevices.com?rev=1609&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1608): titmuss | 2008-01-24 19:42:03 +0000
Bug: 6755
Description:
Modify the jive version number to '7.0 rXXXX'
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive.version
trunk/jive/src/pkg/jive/VisualC/version.h
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
trunk/jive/src/pkg/jive/share/jive/AppletManager.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 24 11:42:38 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1606
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1608
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive.version
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive.version?rev=1609&root=Jive&r1=1608&r2=1609&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive.version (original)
+++ trunk/jive/src/pkg/jive.version Thu Jan 24 11:42:38 2008
@@ -1,1 +1,1 @@
-1
+7.0
Modified: trunk/jive/src/pkg/jive/VisualC/version.h
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/VisualC/version.h?rev=1609&root=Jive&r1=1608&r2=1609&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/VisualC/version.h (original)
+++ trunk/jive/src/pkg/jive/VisualC/version.h Thu Jan 24 11:42:38 2008
@@ -1,2 +1,2 @@
/* This file should be automatically generated with the SVN revision number,
patches welcome */
-#define JIVE_VERSION "1 r0"
+#define JIVE_VERSION "7.0 r0"
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1609&root=Jive&r1=1608&r2=1609&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Thu
Jan 24 11:42:38 2008
@@ -83,7 +83,6 @@
local KEY_VOLUME_DOWN = jive.ui.KEY_VOLUME_DOWN
local KEY_VOLUME_UP = jive.ui.KEY_VOLUME_UP
-local JIVE_VERSION = jive.JIVE_VERSION
local jiveMain = jiveMain
local appletManager = appletManager
local iconbar = iconbar
Modified: trunk/jive/src/pkg/jive/share/jive/AppletManager.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/AppletManager.lua?rev=1609&root=Jive&r1=1608&r2=1609&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/AppletManager.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/AppletManager.lua Thu Jan 24 11:42:38
2008
@@ -194,7 +194,10 @@
local obj = class()
-- check Applet version
- local ver = tonumber(string.match(JIVE_VERSION, "(%d+)"))
+-- FIXME the JIVE_VERSION has changed from '1' to '7.x'. lets not break
+-- the applets now.
+-- local ver = tonumber(string.match(JIVE_VERSION, "(%d+)"))
+ local ver = 1
local min, max = obj:jiveVersion()
if min < ver or max > ver then
error("Incompatible applet " .. entry.appletName)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
