Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index a130a0c1a971487902fdb0ca25d8991bfca88228..357516e9508f58297b9a53716c4893d042cededa 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.1
+-- Prosody IM v0.2
 -- Copyright (C) 2008 Matthew Wild
 -- Copyright (C) 2008 Waqas Hussain
 -- 
@@ -36,7 +36,7 @@ local sm_streamopened = sessionmanager.streamopened;
 local sm_streamclosed = sessionmanager.streamclosed;
 local st = stanza;
 
-local stream_callbacks = { ns = "http://etherx.jabber.org/streams", streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
+local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
 
 function stream_callbacks.error(session, error, data)
        if error == "no-stream" then
@@ -47,7 +47,7 @@ function stream_callbacks.error(session, error, data)
        end
 end
 
-local function handleerr(err) log("error", "Traceback[c2s]:", err, debug.traceback()); end
+local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), debug.traceback()); end
 function stream_callbacks.handlestanza(a, b)
        xpcall(function () core_process_stanza(a, b) end, handleerr);
 end