Software / code / verse
Changeset
246:6c60d19e2180
Merge with Zash
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 28 Nov 2011 15:00:48 +0000 |
| parents | 242:ab4773b0ef5e (current diff) 245:19356e2150f3 (diff) |
| children | 247:7c58c16efa3e 253:aa55793c523e |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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 });
--- 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
