1 files changed, 56 insertions, 19 deletions
diff --git a/Swift/Controllers/WhiteboardManager.cpp b/Swift/Controllers/WhiteboardManager.cpp
index bb73ae3..8ac7ba2 100644
--- a/Swift/Controllers/WhiteboardManager.cpp
+++ b/Swift/Controllers/WhiteboardManager.cpp
@@ -25,8 +25,7 @@ namespace Swift {
 	WhiteboardManager::WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, ChatListWindowFactory* chatListWindowFactory, UIEventStream* uiEventStream, NickResolver* nickResolver, AvatarManager* avatarManager, WhiteboardSessionManager* whiteboardSessionManager) : whiteboardWindowFactory_(whiteboardWindowFactory), uiEventStream_(uiEventStream), nickResolver_(nickResolver), avatarManager_(avatarManager), whiteboardSessionManager_(whiteboardSessionManager) {
 		chatListWindow_ = chatListWindowFactory->createChatListWindow(uiEventStream_);
 		chatListWindow_->onWhiteboardActivated.connect(boost::bind(&WhiteboardManager::activateWindow, this, _1));
-		whiteboardSessionManager_->onRequestAccepted.connect(boost::bind(&WhiteboardManager::handleSessionAccepted, this, _1));
-		whiteboardSessionManager_->onSessionTerminate.connect(boost::bind(&WhiteboardManager::handleSessionTerminated, this, _1));
+		whiteboardSessionManager_->onSessionRequest.connect(boost::bind(&WhiteboardManager::handleIncomingSession, this, _1));
 		uiEventConnection_ = uiEventStream_->onUIEvent.connect(boost::bind(&WhiteboardManager::handleUIEvent, this, _1));
 	}
 
@@ -53,14 +52,7 @@ namespace Swift {
 	void WhiteboardManager::handleUIEvent(boost::shared_ptr<UIEvent> event) {
 		boost::shared_ptr<RequestWhiteboardUIEvent> requestWhiteboardEvent = boost::dynamic_pointer_cast<RequestWhiteboardUIEvent>(event);
 		if (requestWhiteboardEvent) {
-			JID contact = requestWhiteboardEvent->getContact();
-			WhiteboardSession::ref session = whiteboardSessionManager_->requestSession(contact);
-			WhiteboardWindow* window = findWhiteboardWindow(contact);
-			if (window == NULL) {
-				createNewWhiteboardWindow(contact, session);
-			} else {
-				window->setSession(session);
-			}
+			requestSession(requestWhiteboardEvent->getContact());
 		}
 		boost::shared_ptr<AcceptWhiteboardSessionUIEvent> sessionAcceptEvent = boost::dynamic_pointer_cast<AcceptWhiteboardSessionUIEvent>(event);
 		if (sessionAcceptEvent) {
@@ -78,18 +70,29 @@ namespace Swift {
 
 	void WhiteboardManager::acceptSession(const JID& from) {
 		IncomingWhiteboardSession::ref session = boost::dynamic_pointer_cast<IncomingWhiteboardSession>(whiteboardSessionManager_->getSession(from));
-		if (session) {
+		WhiteboardWindow* window = findWhiteboardWindow(from);
+		if (session && window) {
 			session->accept();
-			WhiteboardWindow* window = findWhiteboardWindow(from);
-			if (window == NULL) {
-				window = createNewWhiteboardWindow(from, session);
-			} else {
-				window->setSession(session);
-			}
 			window->show();
 		}
 	}
 
+	void WhiteboardManager::requestSession(const JID& contact) {
+		WhiteboardSession::ref session = whiteboardSessionManager_->requestSession(contact);
+		session->onSessionTerminateReceived.connect(boost::bind(&WhiteboardManager::handleSessionTerminate, this, _1));
+		session->onSessionCancelled.connect(boost::bind(&WhiteboardManager::handleSessionCancel, this, _1));
+		session->onRequestAccepted.connect(boost::bind(&WhiteboardManager::handleSessionAccept, this, _1));
+		session->onRequestRejected.connect(boost::bind(&WhiteboardManager::handleRequestReject, this, _1));
+
+		WhiteboardWindow* window = findWhiteboardWindow(contact);
+		if (window == NULL) {
+			createNewWhiteboardWindow(contact, session);
+		} else {
+			window->setSession(session);
+		}
+		onSessionRequest(session->getTo(), true);
+	}
+
 	void WhiteboardManager::cancelSession(const JID& from) {
 		WhiteboardSession::ref session = whiteboardSessionManager_->getSession(from);
 		if (session) {
@@ -97,7 +100,22 @@ namespace Swift {
 		}
 	}
 
-	void WhiteboardManager::handleSessionAccepted(const JID& from) {
+	void WhiteboardManager::handleIncomingSession(IncomingWhiteboardSession::ref session) {
+		session->onSessionTerminateReceived.connect(boost::bind(&WhiteboardManager::handleSessionTerminate, this, _1));
+		session->onSessionCancelled.connect(boost::bind(&WhiteboardManager::handleSessionCancel, this, _1));
+		session->onRequestAccepted.connect(boost::bind(&WhiteboardManager::handleSessionAccept, this, _1));
+
+		WhiteboardWindow* window = findWhiteboardWindow(session->getTo());
+		if (window == NULL) {
+			createNewWhiteboardWindow(session->getTo(), session);
+		} else {
+			window->setSession(session);
+		}
+
+		onSessionRequest(session->getTo(), false);
+	}
+
+/*	void WhiteboardManager::handleSessionAccepted(const JID& from) {
 		boost::filesystem::path path;
 		JID bareJID = from.toBare();
 		if (avatarManager_) {
@@ -109,7 +127,7 @@ namespace Swift {
 
 	void WhiteboardManager::handleSessionTerminated(const JID& from) {
 		chatListWindow_->removeWhiteboardSession(from.toBare());
-	}
+		}*/
 
 	void WhiteboardManager::activateWindow(const JID& jid) {
 		WhiteboardWindow* window = findWhiteboardWindow(jid);
@@ -117,4 +135,23 @@ namespace Swift {
 			window->activateWindow();
 		}
 	}
+
+	void WhiteboardManager::handleSessionTerminate(const JID& contact) {
+		onSessionTerminate(contact);
+	}
+
+	void WhiteboardManager::handleSessionCancel(const JID& contact) {
+		onSessionTerminate(contact);
+	}
+
+	void WhiteboardManager::handleSessionAccept(const JID& contact) {
+		WhiteboardWindow* window = findWhiteboardWindow(contact);
+		window->show();
+		onRequestAccepted(contact);
+	}
+
+	void WhiteboardManager::handleRequestReject(const JID& contact) {
+		onRequestRejected(contact);
+	}
+
 }