# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1290892364 0
# Node ID 0294428342260a6897b663af0eaaf1a491e97fc4
# Parent  8ae10787272a9eeb86e20264b55447bc3eae3721# Parent  c0148fddd81f56329156c385fd0d076a0ae59578
Merge darkrain->trunk

diff -r 8ae10787272a -r 029442834226 plugins/mod_iq.lua
--- 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);
diff -r 8ae10787272a -r 029442834226 plugins/mod_pep.lua
--- 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];