From 740e8d0146b93ade6ba34f0f6cb524e46b26d2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 24 Jan 2014 22:32:56 +0100
Subject: Sluift: Fix PubSubNode.subscribe

- Make sure 'sluift' is available in core.lua
- Parse the options correctly

Change-Id: I6f830372412008aa61c9203dc4f2f1b2f63b001b

diff --git a/Sluift/core.lua b/Sluift/core.lua
index 1969690..9e81575 100644
--- a/Sluift/core.lua
+++ b/Sluift/core.lua
@@ -4,6 +4,7 @@
 	See the COPYING file for more information.
 --]]
 
+local sluift = select(1, ...)
 local _G = _G
 local pairs, ipairs, print, tostring, type, error, assert, next, rawset, xpcall, unpack = pairs, ipairs, print, tostring, type, error, assert, next, rawset, xpcall, unpack
 local setmetatable, getmetatable = setmetatable, getmetatable
@@ -891,7 +892,8 @@ end
 
 
 function PubSubNode:subscribe(...)
-	local options = parse_options(...)
+	local options = parse_options({}, ...)
+	tprint(options)
 	local jid = options.jid or sluift.jid.to_bare(self.client:jid())
 	return self.client:query_pubsub(merge_tables(
 		{ type = 'set', to = self.jid, query = { 
@@ -903,7 +905,8 @@ function PubSubNode:unsubscribe(options)
 	options = options or {}
 	return self.client:query_pubsub(merge_tables(
 		{ type = 'set', to = self.jid, query = { 
-				_type = 'pubsub_unsubscribe', node = self.node, jid = options['jid'] }
+				_type = 'pubsub_unsubscribe', node = self.node, jid = options['jid'], 
+				subscription_id = 'subscription_id'}
 		}, options))
 end
 
diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp
index 17990e8..50b287b 100644
--- a/Sluift/sluift.cpp
+++ b/Sluift/sluift.cpp
@@ -321,7 +321,8 @@ SLUIFT_API int luaopen_sluift(lua_State* L) {
 	if (luaL_loadbuffer(L, core_lua, core_lua_size, "core.lua") != 0) {
 		lua_error(L);
 	}
-	lua_call(L, 0, 1);
+	lua_pushvalue(L, -2);
+	lua_call(L, 1, 1);
 	Sluift::globals.coreLibIndex = luaL_ref(L, LUA_REGISTRYINDEX);
 
 	lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex);
-- 
cgit v0.10.2-6-g49f6