diff options
Diffstat (limited to 'Swiften/Jingle/JingleSessionManager.cpp')
| -rw-r--r-- | Swiften/Jingle/JingleSessionManager.cpp | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/Jingle/JingleSessionManager.cpp b/Swiften/Jingle/JingleSessionManager.cpp index e60449b..58e90c8 100644 --- a/Swiften/Jingle/JingleSessionManager.cpp +++ b/Swiften/Jingle/JingleSessionManager.cpp @@ -7,6 +7,7 @@  #include <Swiften/Jingle/JingleSessionManager.h>  #include <Swiften/Jingle/JingleResponder.h>  #include <Swiften/Jingle/IncomingJingleSessionHandler.h> +#include <Swiften/Base/foreach.h>  namespace Swift { @@ -18,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) { @@ -31,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;  		}  	}  | 
 Swift