Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-26 10:09:46 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-18 19:11:40 (GMT) |
| commit | bb37c9f89e4135f3128fc98c23ea19eea945c4cd (patch) | |
| tree | 92e9504a27d6eaa8182bb0bab8a7556825a46ad7 /Swiften/Jingle/JingleSessionManager.cpp | |
| parent | 039636edc1b151431cba21a28986ff2be66b5349 (diff) | |
| download | swift-contrib-bb37c9f89e4135f3128fc98c23ea19eea945c4cd.zip swift-contrib-bb37c9f89e4135f3128fc98c23ea19eea945c4cd.tar.bz2 | |
Jingle refactoring.
Diffstat (limited to 'Swiften/Jingle/JingleSessionManager.cpp')
| -rw-r--r-- | Swiften/Jingle/JingleSessionManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Jingle/JingleSessionManager.cpp b/Swiften/Jingle/JingleSessionManager.cpp index af512e8..58e90c8 100644 --- a/Swiften/Jingle/JingleSessionManager.cpp +++ b/Swiften/Jingle/JingleSessionManager.cpp @@ -19,9 +19,9 @@ JingleSessionManager::~JingleSessionManager() { delete responder; } -JingleSession::ref JingleSessionManager::getSession(const JID& jid, const std::string& id) const { +JingleSessionImpl::ref JingleSessionManager::getSession(const JID& jid, const std::string& id) const { SessionMap::const_iterator i = incomingSessions.find(JIDSession(jid, id)); - return i != incomingSessions.end() ? i->second : JingleSession::ref(); + return i != incomingSessions.end() ? i->second : JingleSessionImpl::ref(); } void JingleSessionManager::addIncomingSessionHandler(IncomingJingleSessionHandler* handler) { @@ -32,10 +32,10 @@ void JingleSessionManager::removeIncomingSessionHandler(IncomingJingleSessionHan incomingSessionHandlers.erase(std::remove(incomingSessionHandlers.begin(), incomingSessionHandlers.end(), handler), incomingSessionHandlers.end()); } -void JingleSessionManager::handleIncomingSession(const JID& from, IncomingJingleSession::ref session) { +void JingleSessionManager::handleIncomingSession(const JID& from, JingleSessionImpl::ref session, const std::vector<JingleContentPayload::ref>& contents) { incomingSessions.insert(std::make_pair(JIDSession(from, session->getID()), session)); foreach (IncomingJingleSessionHandler* handler, incomingSessionHandlers) { - if (handler->handleIncomingJingleSession(session)) { + if (handler->handleIncomingJingleSession(session, contents)) { return; } } |