Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 13:00:45 +00:00
Code Issues Releases Activity

Fix building without BUILD_OLD_CONFIG

Browse Source
This commit is contained in:
Nikolas Garofil 2010-11-22 23:45:38 +01:00
parent 5f76f847dd
commit 529392aef0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conky.cc
View File

@ -2655,16 +2655,23 @@ void load_config_file()
#endif #endif
l.loadfile(current_config.c_str()); l.loadfile(current_config.c_str());
} }
#ifdef BUILD_OLD_CONFIG
catch(lua::syntax_error &e) { catch(lua::syntax_error &e) {
NORM_ERR(_("Syntax error (%s) while reading config file. " #define SYNTAX_ERR_READ_CONF "Syntax error (%s) while reading config file. "
"Assuming it's in old syntax and attempting conversion."), e.what()); #ifdef BUILD_OLD_CONFIG
NORM_ERR(_(SYNTAX_ERR_READ_CONF));
NORM_ERR(_("Assuming it's in old syntax and attempting conversion."), e.what());
// the strchr thingy skips the first line (#! /usr/bin/lua) // the strchr thingy skips the first line (#! /usr/bin/lua)
l.loadstring(strchr(convertconf, '\n')); l.loadstring(strchr(convertconf, '\n'));
l.pushstring(current_config.c_str()); l.pushstring(current_config.c_str());
l.call(1, 1); l.call(1, 1);
} #else
char *syntaxerr;
asprintf(&syntaxerr, _(SYNTAX_ERR_READ_CONF), e.what());
std::string syntaxerrobj(syntaxerr);
free(syntaxerr);
throw conky::error(syntaxerrobj);
#endif #endif
}
l.call(0, 0); l.call(0, 0);
l.getglobal("conky"); l.getglobal("conky");