diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-10-22 23:12:26 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-10-22 23:12:26 +0100 |
| commit | e92bd250d19de43dfe0584108d12577bbe1a1c2a (patch) | |
| tree | 01823b0990afedda8cc7ca448f9f975cd6e9d936 /core/sessionmanager.lua | |
| parent | ee7b432ab1d450a42fae24b37c79b7fbda7f4e6b (diff) | |
| parent | c3ca55e0195d03c3e0c23590c387c49068be7723 (diff) | |
| download | prosody-e92bd250d19de43dfe0584108d12577bbe1a1c2a.tar.gz prosody-e92bd250d19de43dfe0584108d12577bbe1a1c2a.zip | |
Merge roster & presence from waqas
Diffstat (limited to 'core/sessionmanager.lua')
| -rw-r--r-- | core/sessionmanager.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 3a5625cb..8bdb93d0 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -12,7 +12,7 @@ local modulemanager = require "core.modulemanager"; local log = require "util.logger".init("sessionmanager"); local error = error; local uuid_generate = require "util.uuid".uuid_generate; -local rm_getroster = require "core.rostermanager".getroster +local rm_load_roster = require "core.rostermanager".load_roster; local newproxy = newproxy; local getmetatable = getmetatable; @@ -84,7 +84,7 @@ function bind_resource(session, resource) else if hosts[session.host].sessions[session.username].sessions[resource] then -- Resource conflict - return false, "conflict"; + return false, "conflict"; -- TODO kick old resource end end @@ -92,7 +92,7 @@ function bind_resource(session, resource) session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; hosts[session.host].sessions[session.username].sessions[resource] = session; - session.roster = rm_getroster(session.username, session.host); + session.roster = rm_load_roster(session.username, session.host); return true; end |