Move most of the resource loading code into ResourceManager_base

I mostly do this to avoid code duplication between fluxbox and fluxbox-update_configs.

1 files changed, 3 insertions, 27 deletions

diff --git a/src/FbTk/LResource.cc b/src/FbTk/LResource.cc
index de90b95..18209cb 100644
--- a/src/FbTk/LResource.cc
+++ b/src/FbTk/LResource.cc
@@ -116,34 +116,12 @@ LResourceManager::LResourceManager(const std::string &root, Lua &l, unsigned int
     setLua(l);
 }
 
-void LResourceManager::load(const std::string &filename, const std::string &fallback) {
-    _FB_USES_NLS;
+void LResourceManager::doLoad(const std::string &filename) {
     m_l->checkstack(1);
     lua::stack_sentry s(*m_l);
 
-    m_filename = filename;
-
-    try {
-        m_l->loadfile(filename.c_str());
-        m_l->call(0, 0);
-    }
-    catch(lua::exception &e) {
-        std::cerr << _FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database",
-                "Failed trying to read rc file") << ":" << filename << std::endl;
-        std::cerr << "Fluxbox: " << e.what() << std::endl;
-        std::cerr << _FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with",
-                "Retrying rc file loading with (the following file)")
-            << ": " << fallback << std::endl;
-        try {
-            m_l->loadfile(fallback.c_str());
-            m_l->call(0, 0);
-        }
-        catch(lua::exception &e) {
-            std::cerr << _FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")
-                << ": " << fallback << std::endl;
-            std::cerr << "Fluxbox: " << e.what() << std::endl;
-        }
-    }
+    m_l->loadfile(filename.c_str());
+    m_l->call(0, 0);
 }
 
 bool LResourceManager::save(const char *filename, const char *) {
@@ -153,8 +131,6 @@ bool LResourceManager::save(const char *filename, const char *) {
     if(filename == NULL)
         filename = m_filename.c_str();
 
-    std::cerr << "XXX SAVING " << filename << std::endl;
-
     m_l->getfield(lua::REGISTRYINDEX, dump_resources);
     m_l->getfield(lua::GLOBALSINDEX, m_root.c_str());
     m_l->pushstring(filename);