# HG changeset patch
# User Robert Hoelz <rob@hoelz.ro>
# Date 1291919285 21600
# Node ID 32d4a73901e2c985bb0aa37c413d4f5c24a810f4
# Parent  048af3ee5899425336c246d36823e84c9a4c866f
mod_presence, mod_offline: Merge message/offline/delete with message/offline/broadcast.

diff -r 048af3ee5899 -r 32d4a73901e2 plugins/mod_offline.lua
--- a/plugins/mod_offline.lua	Thu Dec 09 12:23:37 2010 -0600
+++ b/plugins/mod_offline.lua	Thu Dec 09 12:28:05 2010 -0600
@@ -47,13 +47,7 @@
 			stanza.attr.stamp, stanza.attr.stamp_legacy = nil, nil;
 			origin.send(stanza);
 		end
+		datamanager.list_store(node, host, "offline", nil);
 		return true;
 	end
 end);
-
-module:hook("message/offline/delete", function(event)
-	local origin = event.origin;
-	local node, host = origin.username, origin.host;
-
-	return datamanager.list_store(node, host, "offline", nil);
-end);
diff -r 048af3ee5899 -r 32d4a73901e2 plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Thu Dec 09 12:23:37 2010 -0600
+++ b/plugins/mod_presence.lua	Thu Dec 09 12:28:05 2010 -0600
@@ -117,7 +117,6 @@
 		if priority >= 0 then
                         local event = { origin = origin }
                         module:fire_event('message/offline/broadcast', event);
-                        module:fire_event('message/offline/delete', event);
 		end
 	end
 	if stanza.attr.type == "unavailable" then