Swiftdiff options
| author | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-08-07 17:52:36 (GMT) |
|---|---|---|
| committer | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-08-07 17:52:36 (GMT) |
| commit | a7a2f6124fd733926a0effe486cffee03bf9fde0 (patch) | |
| tree | d028d9613b72f4fbaca031b33b718eb5ca6666e9 /Swiften | |
| parent | 4239fd83f1774cbcae15a501a4aa8d9fa4925181 (diff) | |
| download | swift-contrib-a7a2f6124fd733926a0effe486cffee03bf9fde0.zip swift-contrib-a7a2f6124fd733926a0effe486cffee03bf9fde0.tar.bz2 | |
"Chats" tab shows opened whiteboard sessions
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Whiteboard/IncomingWhiteboardSession.cpp | 1 | ||||
| -rw-r--r-- | Swiften/Whiteboard/WhiteboardSession.h | 1 | ||||
| -rw-r--r-- | Swiften/Whiteboard/WhiteboardSessionManager.cpp | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp index ae69a9d..d0da375 100644 --- a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp +++ b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp @@ -23,6 +23,7 @@ namespace Swift { boost::shared_ptr<WhiteboardPayload> payload = boost::make_shared<WhiteboardPayload>(WhiteboardPayload::SessionAccept); boost::shared_ptr<GenericRequest<WhiteboardPayload> > request = boost::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_); request->send(); + onRequestAccepted(toJID_); } std::string IncomingWhiteboardSession::getClientID() const { diff --git a/Swiften/Whiteboard/WhiteboardSession.h b/Swiften/Whiteboard/WhiteboardSession.h index abfdd32..1b5d93f 100644 --- a/Swiften/Whiteboard/WhiteboardSession.h +++ b/Swiften/Whiteboard/WhiteboardSession.h @@ -44,7 +44,6 @@ namespace Swift { private: virtual void handleIncomingOperation(WhiteboardOperation::ref operation) = 0; - //virtual void handleSendOperationRequest(WhiteboardOperation::ref operation) = 0; protected: void sendPayload(boost::shared_ptr<WhiteboardPayload> payload); diff --git a/Swiften/Whiteboard/WhiteboardSessionManager.cpp b/Swiften/Whiteboard/WhiteboardSessionManager.cpp index a3985be..effdc4b 100644 --- a/Swiften/Whiteboard/WhiteboardSessionManager.cpp +++ b/Swiften/Whiteboard/WhiteboardSessionManager.cpp @@ -63,6 +63,7 @@ namespace Swift { sessions_[session->getTo().toBare()] = session; session->onSessionTerminateReceived.connect(boost::bind(&WhiteboardSessionManager::handleSessionTerminate, this, _1)); session->onSessionCancelled.connect(boost::bind(&WhiteboardSessionManager::handleSessionCancel, this, _1)); + session->onRequestAccepted.connect(boost::bind(&WhiteboardSessionManager::handleSessionAccept, this, _1)); onSessionRequest(session->getTo(), false); } |