Author: titmuss
Date: Fri Jan 25 01:03:03 2008
New Revision: 1628
URL: http://svn.slimdevices.com?rev=1628&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1627): blblack | 2008-01-25 02:03:28 +0000
fix global_settings_file to work on win32 too (it seems fopen("foo", "r") on
win32 fails for directories ...)
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/jive/ui/Framework.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jan 25 01:03:03 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1623
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1627
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/ui/Framework.lua?rev=1628&root=Jive&r1=1627&r2=1628&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Framework.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Framework.lua Fri Jan 25 01:03:03 2008
@@ -468,7 +468,8 @@
-- One-shot initialization, the first
-- time someone accesses a Global Setting
- global_settings_file = self:findFile("jive/") ..
"global_settings.txt"
+ global_settings_file =
self:findFile("jive/JiveMain.lua"):sub(1,-13)
+ .. "global_settings.txt"
local fh = io.open(global_settings_file)
if fh == nil then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
