# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1249318382 -3600
# Node ID fa49cbfff0e6d99b1e9a224233e71323567e6b31
# Parent  6b2109012688f4154adaf036225dcaf75e1edac9# Parent  cb3d937dd1da177077e16ac0d570efb49a604c05
Merge with waqas

diff -r cb3d937dd1da -r fa49cbfff0e6 .hgtags
--- a/.hgtags	Sun Aug 02 14:40:34 2009 +0500
+++ b/.hgtags	Mon Aug 03 17:53:02 2009 +0100
@@ -26,3 +26,4 @@
 b1b42ce4f0f6a8f587c2925724694c0e8b437dce 0.4.2
 6b91a2b39680f0f7195fec561a3ce3d660ea0c20 0.4.2
 06030af44faddd7d3c20e7d380bb55b92b079c5f 0.5.0
+a63ff2fbba8d0a29503e7552a29fc7c831faa23c 0.5.1
diff -r cb3d937dd1da -r fa49cbfff0e6 plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Sun Aug 02 14:40:34 2009 +0500
+++ b/plugins/mod_pep.lua	Mon Aug 03 17:53:02 2009 +0100
@@ -134,6 +134,7 @@
 				payload = payload.tags[1];
 				if payload then -- <item>
 					publish(session, node, payload);
+					session.send(st.reply(stanza));
 					return true;
 				end
 			end
diff -r cb3d937dd1da -r fa49cbfff0e6 plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Sun Aug 02 14:40:34 2009 +0500
+++ b/plugins/mod_presence.lua	Mon Aug 03 17:53:02 2009 +0100
@@ -165,6 +165,7 @@
 
 function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza)
 	local node, host = jid_split(from_bare);
+	if node == origin.username and host == origin.host then return; end -- No self contacts
 	local st_from, st_to = stanza.attr.from, stanza.attr.to;
 	stanza.attr.from, stanza.attr.to = from_bare, to_bare;
 	log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare);