1 files changed, 0 insertions, 9 deletions
diff --git a/Sluift/client.cpp b/Sluift/client.cpp
index e2ba480..63e3bf1 100644
--- a/Sluift/client.cpp
+++ b/Sluift/client.cpp
@@ -17,132 +17,123 @@
 #include <Swiften/Elements/RawXMLPayload.h>
 #include <Swiften/Elements/RosterItemPayload.h>
 #include <Swiften/Elements/RosterPayload.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Disco/ClientDiscoManager.h>
 #include <Swiften/Queries/GenericRequest.h>
 #include <Swiften/Presence/PresenceSender.h>
 #include <Swiften/Roster/XMPPRoster.h>
 #include <Swiften/Roster/SetRosterRequest.h>
 #include <Swiften/Presence/SubscriptionManager.h>
 #include <Swiften/Roster/XMPPRosterItem.h>
 #include <Swiften/Queries/Requests/GetSoftwareVersionRequest.h>
 #include <Sluift/Lua/FunctionRegistration.h>
 #include <Swiften/Base/foreach.h>
 #include <Sluift/Lua/Check.h>
 #include <Sluift/Lua/Value.h>
 #include <Sluift/Lua/Exception.h>
 #include <Sluift/Lua/LuaUtils.h>
 #include <Sluift/globals.h>
 
 using namespace Swift;
 namespace lambda = boost::lambda;
 
 static inline SluiftClient* getClient(lua_State* L) {
 	return *Lua::checkUserData<SluiftClient>(L, 1);
 }
 
 static inline int getGlobalTimeout(lua_State* L) {
 	lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.moduleLibIndex);
 	lua_getfield(L, -1, "timeout");
 	int result = boost::numeric_cast<int>(lua_tointeger(L, -1));
 	lua_pop(L, 2);
 	return result;
 }
 
-static inline bool getGlobalDebug(lua_State* L) {
-	lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.moduleLibIndex);
-	lua_getfield(L, -1, "debug");
-	int result = lua_toboolean(L, -1);
-	lua_pop(L, 2);
-	return result;
-}
-
 static void addPayloadsToTable(lua_State* L, const std::vector<boost::shared_ptr<Payload> >& payloads) {
 	if (!payloads.empty()) {
 		lua_createtable(L, boost::numeric_cast<int>(payloads.size()), 0);
 		for (size_t i = 0; i < payloads.size(); ++i) {
 			Sluift::globals.elementConvertor.convertToLua(L, payloads[i]);
 			lua_rawseti(L, -2, boost::numeric_cast<int>(i+1));
 		}
 		Lua::registerGetByTypeIndex(L, -1);
 		lua_setfield(L, -2, "payloads");
 	}
 }
 
 static boost::shared_ptr<Payload> getPayload(lua_State* L, int index) {
 	if (lua_type(L, index) == LUA_TTABLE) {
 		return Sluift::globals.elementConvertor.convertFromLua(L, index);
 	}
 	else if (lua_type(L, index) == LUA_TSTRING) {
 		return boost::make_shared<RawXMLPayload>(Lua::checkString(L, index));
 	}
 	else {
 		return boost::shared_ptr<Payload>();
 	}
 }
 
 static std::vector< boost::shared_ptr<Payload> > getPayloadsFromTable(lua_State* L, int index) {
 	index = Lua::absoluteOffset(L, index);
 	std::vector< boost::shared_ptr<Payload> > result;
 	lua_getfield(L, index, "payloads");
 	if (lua_istable(L, -1)) {
 		for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) {
 			boost::shared_ptr<Payload> payload = getPayload(L, -1);
 			if (payload) {
 				result.push_back(payload);
 			}
 		}
 	}
 	lua_pop(L, 1);
 	return result;
 }
 
 SLUIFT_LUA_FUNCTION(Client, async_connect) {
 	SluiftClient* client = getClient(L);
 
 	std::string host = client->getOptions().manualHostname;
 	int port = client->getOptions().manualPort;
 	if (lua_istable(L, 2)) {
 		if (boost::optional<std::string> hostString = Lua::getStringField(L, 2, "host")) {
 			host = *hostString;
 		}
 		if (boost::optional<int> portInt = Lua::getIntField(L, 2, "port")) {
 			port = *portInt;
 		}
 	}
-	client->setTraceEnabled(getGlobalDebug(L));
 	client->connect(host, port);
 	return 0;
 }
 
 SLUIFT_LUA_FUNCTION_WITH_HELP(
 		Client, set_trace_enabled,
 		"Enable/disable tracing of the data sent/received.\n\n.",
 		"self\n"
 		"enable  a boolean specifying whether to enable/disable tracing",
 		""
 ) {
 	getClient(L)->setTraceEnabled(lua_toboolean(L, 1));
 	return 0;
 }
 
 SLUIFT_LUA_FUNCTION_WITH_HELP(
 		Client, wait_connected,
 		"Block until the client is connected.\n\nThis is useful after an `async_connect`.",
 		"self",
 		""
 ) {
 	getClient(L)->waitConnected(getGlobalTimeout(L));
 	return 0;
 }
 
 SLUIFT_LUA_FUNCTION_WITH_HELP(
 		Client, is_connected,
 		"Checks whether this client is still connected.\n\nReturns a boolean.",
 		"self\n",
 		""
 ) {
 	lua_pushboolean(L, getClient(L)->isConnected());
 	return 1;
 }