# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1246074267 -3600
# Node ID 8a59a694a9c0666951ccfcbfd06a7bf314960fdd
# Parent  9fe9ba693f4a42982984c404bae6f1c54e6d3761# Parent  5e72c3e1743abbc775670422aeb5eb8df2c2469f
Automated merge with http://waqas.ath.cx:8000/

diff -r 9fe9ba693f4a -r 8a59a694a9c0 net/xmppclient_listener.lua
--- a/net/xmppclient_listener.lua	Sat Jun 27 08:38:52 2009 +0500
+++ b/net/xmppclient_listener.lua	Sat Jun 27 04:44:27 2009 +0100
@@ -95,7 +95,7 @@
 		end
 		session.send("</stream:stream>");
 		session.conn.close();
-		xmppclient.disconnect(session.conn, "stream error");
+		xmppclient.disconnect(session.conn, reason.condition or reason or "session closed");
 	end
 end
 
@@ -136,7 +136,7 @@
 	local session = sessions[conn];
 	if session then
 		(session.log or log)("info", "Client disconnected: %s", err);
-		sm_destroy_session(session);
+		sm_destroy_session(session, err);
 		sessions[conn]  = nil;
 		session = nil;
 		collectgarbage("collect");
diff -r 9fe9ba693f4a -r 8a59a694a9c0 plugins/mod_message.lua
--- a/plugins/mod_message.lua	Sat Jun 27 08:38:52 2009 +0500
+++ b/plugins/mod_message.lua	Sat Jun 27 04:44:27 2009 +0100
@@ -67,3 +67,5 @@
 
 	return process_to_bare(stanza.attr.to or (origin.username..'@'..origin.host), origin, stanza);
 end);
+
+module:add_feature("msgoffline");