Reverted commit bcb6336

This commit is contained in:
Alex Szpakowski
2013-08-26 00:53:14 -03:00
parent af1cf14b7f
commit 3f1221a7f9
+13 -6
View File
@@ -57,17 +57,24 @@ int w_getClipboardText(lua_State *L)
int w_getPowerInfo(lua_State *L) int w_getPowerInfo(lua_State *L)
{ {
int seconds = -1, percent = -1; int seconds = -1, percent = -1;
const char *statestr; const char *str;
System::PowerState state = instance->getPowerInfo(seconds, percent); System::PowerState state = instance->getPowerInfo(seconds, percent);
if (!System::getConstant(state, statestr)) if (!System::getConstant(state, str))
statestr = "unknown"; str = "unknown";
lua_pushstring(L, statestr); lua_pushstring(L, str);
lua_pushinteger(L, percent); if (percent >= 0)
lua_pushinteger(L, seconds); lua_pushinteger(L, percent);
else
lua_pushnil(L);
if (seconds >= 0)
lua_pushinteger(L, seconds);
else
lua_pushnil(L);
return 3; return 3;
} }