Factor out "session." from resource names

this reduces typing and it makes more sense in lua, since there the resources are implemented as
hierarchical tables and the topmost table has to be handled a bit specially.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main.cc b/src/main.cc
index a18ae56..4723c09 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -383,8 +383,8 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
 
     const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h'
 
-    FbTk::ResourceManager r_mgr(rc_file.c_str(), false);
-    FbTk::IntResource c_version(r_mgr, 0, "session.configVersion", "Session.ConfigVersion");
+    FbTk::ResourceManager r_mgr("session", "Session", rc_file.c_str(), false);
+    FbTk::IntResource c_version(r_mgr, 0, "configVersion", "ConfigVersion");
 
     if (!r_mgr.load(rc_file.c_str())) {
         _FB_USES_NLS;
@@ -416,9 +416,10 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
 #include "WinButton.hh"
 int main(int argc, char **argv) {
 
+#if 0
     lua::state l;
     FbTk::LResourceManager::initState(l);
-    FbTk::LResourceManager man(l, "session");
+    FbTk::LResourceManager man("session", l);
     l.loadstring("session.asdf = {'close', 'close'}; session.q={{1,2,{3,4}},{{z={{5}}}}};");
     l.call(0,0);
     man.save("/dev/stdout", NULL);
@@ -426,7 +427,7 @@ int main(int argc, char **argv) {
     cout << "asdf: " << asdf.getString() << endl;
     man.save("/dev/stdout", NULL);
     return 0;
-
+#endif
 
     FbTk::NLSInit("fluxbox.cat");