diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-01 15:33:40 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:12:17 (GMT) |
commit | 05d222c463f4b7e84973eec9a211f4ac1bd35d0f (patch) | |
tree | b1dcb535742a5c2705f5bb5fa261702bf3c742d6 /src/fluxbox.cc | |
parent | 6b8cac1f4cadd81f2d3ed313e2bc05af51c84643 (diff) | |
download | fluxbox_paul-05d222c463f4b7e84973eec9a211f4ac1bd35d0f.zip fluxbox_paul-05d222c463f4b7e84973eec9a211f4ac1bd35d0f.tar.bz2 |
Refactoring: move details if init file loading into LResourceManager
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 224c7f0..a26fd66 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -1149,28 +1149,8 @@ string Fluxbox::getDefaultDataFilename(const char *name) const { | |||
1149 | 1149 | ||
1150 | /// loads resources | 1150 | /// loads resources |
1151 | void Fluxbox::load_rc() { | 1151 | void Fluxbox::load_rc() { |
1152 | _FB_USES_NLS; | ||
1153 | lua::stack_sentry s(*m_l); | ||
1154 | |||
1155 | string dbfile(getRcFilename()); | ||
1156 | 1152 | ||
1157 | try { | 1153 | m_resourcemanager.load(getRcFilename(), DEFAULT_INITFILE); |
1158 | m_l->loadfile(dbfile.c_str()); | ||
1159 | m_l->call(0, 0); | ||
1160 | } | ||
1161 | catch(lua::exception &e) { | ||
1162 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<dbfile<<endl; | ||
1163 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1164 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", "Retrying rc file loading with (the following file)")<<": "<<DEFAULT_INITFILE<<endl; | ||
1165 | try { | ||
1166 | m_l->loadfile(DEFAULT_INITFILE); | ||
1167 | m_l->call(0, 0); | ||
1168 | } | ||
1169 | catch(lua::exception &e) { | ||
1170 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl; | ||
1171 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1172 | } | ||
1173 | } | ||
1174 | 1154 | ||
1175 | if (m_rc_menufile->empty()) | 1155 | if (m_rc_menufile->empty()) |
1176 | m_rc_menufile.setDefaultValue(); | 1156 | m_rc_menufile.setDefaultValue(); |