Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge darkrain->trunk
Sat, 27 Nov 2010 21:12:44 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Sat, 27 Nov 2010 21:12:44 +0000
- changeset 3653
- 029442834226
- parent 3650
- 8ae10787272a (current diff)
- parent 3652
- c0148fddd81f (diff)
- child 3654
- 8afd15a61743
Merge darkrain->trunk
--- a/plugins/mod_iq.lua Sun Nov 21 21:10:46 2010 -0800 +++ b/plugins/mod_iq.lua Sat Nov 27 21:12:44 2010 +0000 @@ -37,7 +37,7 @@ if stanza.attr.type == "get" or stanza.attr.type == "set" then return module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data); else - module:fire_event("iq/bare/"..stanza.attr.id, data); + module:fire_event("iq-"..stanza.attr.type.."/bare/"..stanza.attr.id, data); return true; end end); @@ -49,7 +49,7 @@ if stanza.attr.type == "get" or stanza.attr.type == "set" then return module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data); else - module:fire_event("iq/self/"..stanza.attr.id, data); + module:fire_event("iq-"..stanza.attr.type.."/self/"..stanza.attr.id, data); return true; end end); @@ -61,7 +61,7 @@ if stanza.attr.type == "get" or stanza.attr.type == "set" then return module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data); else - module:fire_event("iq/host/"..stanza.attr.id, data); + module:fire_event("iq-"..stanza.attr.type.."/host/"..stanza.attr.id, data); return true; end end);
--- a/plugins/mod_pep.lua Sun Nov 21 21:10:46 2010 -0800 +++ b/plugins/mod_pep.lua Sat Nov 27 21:12:44 2010 +0000 @@ -208,7 +208,7 @@ end end); -module:hook("iq/bare/disco", function(event) +module:hook("iq-result/bare/disco", function(event) local session, stanza = event.origin, event.stanza; if stanza.attr.type == "result" then local disco = stanza.tags[1];
