# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1443197484 -7200
# Node ID d5b416070f7043cd37ac9b6db625c25b088895ee
# Parent  de32d195e932d5a5224ecf686e2a71e3180eb59a# Parent  5ce783c3702418d6bfe588904187f3546ae449dd
Merge 0.9->0.10

diff -r de32d195e932 -r d5b416070f70 tools/xep227toprosody.lua
--- a/tools/xep227toprosody.lua	Fri Sep 25 18:07:33 2015 +0200
+++ b/tools/xep227toprosody.lua	Fri Sep 25 18:11:24 2015 +0200
@@ -202,7 +202,7 @@
 	--count = count + 1;
 	if curr_host ~= "" then
 		-- forward to xmlhandlers
-		user_handlers:StartElement(elementname, attributes);
+		user_handlers.StartElement(parser, elementname, attributes);
 	elseif (curr_ns == xmlns_xep227) and (name == "host") then
 		curr_host = attributes["jid"]; -- start of host element
 		print("Begin parsing host "..curr_host);
@@ -226,7 +226,7 @@
 			curr_host = "" -- end of host element
 		else
 			-- forward to xmlhandlers
-			user_handlers:EndElement(elementname);
+			user_handlers.EndElement(parser, elementname);
 		end
 	elseif (curr_ns ~= xmlns_xep227) or (name ~= "server-data") then
 		io.stderr:write("Unhandled XML element: ", name, "\n");
@@ -237,7 +237,7 @@
 function lxp_handlers.CharacterData(parser, string)
 	if curr_host ~= "" then
 		-- forward to xmlhandlers
-		user_handlers:CharacterData(string);
+		user_handlers.CharacterData(parser, string);
 	end
 end