From 89f728a37223b3e7cd9cf9d76ce9e77b3dee9460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Wed, 2 Mar 2011 20:13:28 +0100 Subject: Return client on sluift mutators. diff --git a/Sluift/Examples/Login.lua b/Sluift/Examples/Login.lua index d93e990..c1f42d2 100644 --- a/Sluift/Examples/Login.lua +++ b/Sluift/Examples/Login.lua @@ -19,7 +19,6 @@ sluift.debug = os.getenv("SLUIFT_DEBUG") or false print("Connecting " .. os.getenv("SLUIFT_JID") .. " ...") c = sluift.new_client(os.getenv("SLUIFT_JID"), os.getenv("SLUIFT_PASS")) c:set_options({compress = false, tls = false}) -c:connect() -c:send_presence("") +c:connect():send_presence("") print("Connected ...") diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp index d4692a3..8f32da6 100644 --- a/Sluift/sluift.cpp +++ b/Sluift/sluift.cpp @@ -199,7 +199,7 @@ static int sluift_client_connect(lua_State *L) { SluiftClient* client = getClient(L); client->connect(); client->waitConnected(); - return 0; + return 1; } catch (const SluiftException& e) { return luaL_error(L, e.getReason().c_str()); @@ -209,7 +209,7 @@ static int sluift_client_connect(lua_State *L) { static int sluift_client_async_connect(lua_State *L) { try { getClient(L)->connect(); - return 0; + return 1; } catch (const SluiftException& e) { return luaL_error(L, e.getReason().c_str()); @@ -219,7 +219,7 @@ static int sluift_client_async_connect(lua_State *L) { static int sluift_client_wait_connected(lua_State *L) { try { getClient(L)->waitConnected(); - return 0; + return 1; } catch (const SluiftException& e) { return luaL_error(L, e.getReason().c_str()); @@ -234,7 +234,7 @@ static int sluift_client_is_connected(lua_State *L) { static int sluift_client_disconnect(lua_State *L) { try { getClient(L)->disconnect(); - return 0; + return 1; } catch (const SluiftException& e) { return luaL_error(L, e.getReason().c_str()); @@ -252,7 +252,8 @@ static int sluift_client_set_version(lua_State *L) { const char* rawOS = lua_tostring(L, -1); client->setSoftwareVersion(rawName ? rawName : "", rawVersion ? rawVersion : "", rawOS ? rawOS : ""); lua_pop(L, 3); - return 0; + lua_pushvalue(L, 1); + return 1; } static int sluift_client_get_roster(lua_State *L) { @@ -307,11 +308,13 @@ static int sluift_client_get_version(lua_State *L) { static int sluift_client_send_message(lua_State *L) { getClient(L)->sendMessage(std::string(luaL_checkstring(L, 2)), luaL_checkstring(L, 3)); - return 0; + lua_pushvalue(L, 1); + return 1; } static int sluift_client_send_presence(lua_State *L) { getClient(L)->sendPresence(std::string(luaL_checkstring(L, 2))); + lua_pushvalue(L, 1); return 0; } @@ -349,6 +352,7 @@ static int sluift_client_set(lua_State *L) { static int sluift_client_send(lua_State *L) { getClient(L)->getClient()->sendData(std::string(luaL_checkstring(L, 2))); + lua_pushvalue(L, 1); return 0; } @@ -364,6 +368,7 @@ static int sluift_client_set_options(lua_State* L) { bool useTLS = lua_toboolean(L, -1); client->getClient()->setUseTLS(useTLS ? Client::UseTLSWhenAvailable : Client::NeverUseTLS); } + lua_pushvalue(L, 1); return 0; } -- cgit v0.10.2-6-g49f6