1 files changed, 5 insertions, 26 deletions
diff --git a/Swift/Controllers/WhiteboardManager.cpp b/Swift/Controllers/WhiteboardManager.cpp
index 8ac7ba2..2b6c448 100644
--- a/Swift/Controllers/WhiteboardManager.cpp
+++ b/Swift/Controllers/WhiteboardManager.cpp
@@ -13,7 +13,6 @@
 #include <Swift/Controllers/UIEvents/AcceptWhiteboardSessionUIEvent.h>
 #include <Swift/Controllers/UIEvents/CancelWhiteboardSessionUIEvent.h>
 #include <Swift/Controllers/UIEvents/ShowWhiteboardUIEvent.h>
-#include <Swift/Controllers/UIInterfaces/ChatListWindowFactory.h>
 #include "Swiften/Client/NickResolver.h"
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Avatars/AvatarManager.h>
@@ -22,9 +21,7 @@
 namespace Swift {
 	typedef std::pair<JID, WhiteboardWindow*> JIDWhiteboardWindowPair;
 
-	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));
+	WhiteboardManager::WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, UIEventStream* uiEventStream, NickResolver* nickResolver, AvatarManager* avatarManager, WhiteboardSessionManager* whiteboardSessionManager) : whiteboardWindowFactory_(whiteboardWindowFactory), uiEventStream_(uiEventStream), nickResolver_(nickResolver), avatarManager_(avatarManager), whiteboardSessionManager_(whiteboardSessionManager) {
 		whiteboardSessionManager_->onSessionRequest.connect(boost::bind(&WhiteboardManager::handleIncomingSession, this, _1));
 		uiEventConnection_ = uiEventStream_->onUIEvent.connect(boost::bind(&WhiteboardManager::handleUIEvent, this, _1));
 	}
@@ -64,7 +61,10 @@ namespace Swift {
 		}
 		boost::shared_ptr<ShowWhiteboardUIEvent> showWindowEvent = boost::dynamic_pointer_cast<ShowWhiteboardUIEvent>(event);
 		if (showWindowEvent) {
-			activateWindow(showWindowEvent->getContact());
+			WhiteboardWindow* window = findWhiteboardWindow(showWindowEvent->getContact());
+			if (window != NULL) {
+				window->activateWindow();
+			}
 		}
 	}
 
@@ -115,27 +115,6 @@ namespace Swift {
 		onSessionRequest(session->getTo(), false);
 	}
 
-/*	void WhiteboardManager::handleSessionAccepted(const JID& from) {
-		boost::filesystem::path path;
-		JID bareJID = from.toBare();
-		if (avatarManager_) {
-			path = avatarManager_->getAvatarPath(bareJID);
-		}
-		ChatListWindow::Chat chat(bareJID, nickResolver_->jidToNick(bareJID), "", 0, StatusShow::None, path, false);
- 		chatListWindow_->addWhiteboardSession(chat);
-	}
-
-	void WhiteboardManager::handleSessionTerminated(const JID& from) {
-		chatListWindow_->removeWhiteboardSession(from.toBare());
-		}*/
-
-	void WhiteboardManager::activateWindow(const JID& jid) {
-		WhiteboardWindow* window = findWhiteboardWindow(jid);
-		if (window != NULL) {
-			window->activateWindow();
-		}
-	}
-
 	void WhiteboardManager::handleSessionTerminate(const JID& contact) {
 		onSessionTerminate(contact);
 	}