# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1322492448 0
# Node ID 6c60d19e218050fdcd88fe9b5f6c0c314b3644bb
# Parent  ab4773b0ef5ee3e0c065f1795452a61139a9a3e9# Parent  19356e2150f3efc0262f3e8ff2028256b9555aa9
Merge with Zash

diff -r ab4773b0ef5e -r 6c60d19e2180 doc/example_pep.lua
--- a/doc/example_pep.lua	Sun Nov 27 23:00:15 2011 +0000
+++ b/doc/example_pep.lua	Mon Nov 28 15:00:48 2011 +0000
@@ -48,7 +48,7 @@
 	end);
 	
 	c:hook_pep("http://jabber.org/protocol/tune", function (event)
-		print(event.from.." is listening to "..event.item:get_child("title"):get_text());
+		print(event.from.." is listening to "..event.item:get_child_text("title"));
 	end);
 end);
 
diff -r ab4773b0ef5e -r 6c60d19e2180 plugins/bind.lua
--- a/plugins/bind.lua	Sun Nov 27 23:00:15 2011 +0000
+++ b/plugins/bind.lua	Mon Nov 28 15:00:48 2011 +0000
@@ -9,8 +9,7 @@
 				if reply.attr.type == "result" then
 					local result_jid = reply
 						:get_child("bind", xmlns_bind)
-							:get_child("jid")
-								:get_text();
+							:get_child_text("jid");
 					stream.username, stream.host, stream.resource = jid.split(result_jid);
 					stream.jid, stream.bound = result_jid, true;
 					stream:event("bind-success", { jid = result_jid });
diff -r ab4773b0ef5e -r 6c60d19e2180 plugins/vcard_update.lua
--- a/plugins/vcard_update.lua	Sun Nov 27 23:00:15 2011 +0000
+++ b/plugins/vcard_update.lua	Mon Nov 28 15:00:48 2011 +0000
@@ -92,7 +92,7 @@
 	stream:hook("presence", function(presence)
 			local x_vcard_update = presence:get_child("x", xmlns_vcard_update);
 			local photo_hash = x_vcard_update and x_vcard_update:get_child("photo");
-				:get_child("photo"):get_text(hash);
+				:get_child_text("photo");
 			if x_vcard_update then
 				-- TODO Cache peoples avatars here
 			end