5 files changed, 44 insertions, 7 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
index 6ac8d4a..5bbd490 100644
--- a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
+++ b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
@@ -16,6 +16,8 @@ namespace Swift {
 			virtual ~MockChatListWindow() {};
 			void addMUCBookmark(const MUCBookmark& /*bookmark*/) {}
 			void removeMUCBookmark(const MUCBookmark& /*bookmark*/) {}
+			void addWhiteboardSession(const ChatListWindow::Chat& /*chat*/) {};
+			void removeWhiteboardSession(const JID& /*jid*/) {};
 			void setBookmarksEnabled(bool /*enabled*/) {}
 			void setRecents(const std::list<ChatListWindow::Chat>& /*recents*/) {}
 			void setUnreadCount(int /*unread*/) {}
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index c1cc055..c9c4773 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -321,7 +321,7 @@ void MainController::handleConnected() {
 		userSearchControllerChat_ = new UserSearchController(UserSearchController::StartChat, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_);
 		userSearchControllerAdd_ = new UserSearchController(UserSearchController::AddContact, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_);
 		adHocManager_ = new AdHocManager(JID(boundJID_.getDomain()), uiFactory_, client_->getIQRouter(), uiEventStream_, rosterController_->getWindow());
-		whiteboardManager_ = new WhiteboardManager(uiFactory_, uiEventStream_, client_->getNickResolver(), client_->getWhiteboardSessionManager());
+		whiteboardManager_ = new WhiteboardManager(uiFactory_, uiFactory_, uiEventStream_, client_->getNickResolver(), client_->getAvatarManager(), client_->getWhiteboardSessionManager());
 	}
 	loginWindow_->setIsLoggingIn(false);
 
diff --git a/Swift/Controllers/UIInterfaces/ChatListWindow.h b/Swift/Controllers/UIInterfaces/ChatListWindow.h
index d047f8c..cb55bb3 100644
--- a/Swift/Controllers/UIInterfaces/ChatListWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatListWindow.h
@@ -48,6 +48,8 @@ namespace Swift {
 
 			virtual void setBookmarksEnabled(bool enabled) = 0;
 			virtual void addMUCBookmark(const MUCBookmark& bookmark) = 0;
+			virtual void addWhiteboardSession(const ChatListWindow::Chat& chat) = 0;
+			virtual void removeWhiteboardSession(const JID& jid) = 0;
 			virtual void removeMUCBookmark(const MUCBookmark& bookmark) = 0;
 			virtual void setRecents(const std::list<Chat>& recents) = 0;
 			virtual void setUnreadCount(int unread) = 0;
@@ -55,6 +57,7 @@ namespace Swift {
 
 			boost::signal<void (const MUCBookmark&)> onMUCBookmarkActivated;
 			boost::signal<void (const Chat&)> onRecentActivated;
+			boost::signal<void (const JID&)> onWhiteboardActivated;
 			boost::signal<void ()> onClearRecentsRequested;
 	};
 }
diff --git a/Swift/Controllers/WhiteboardManager.cpp b/Swift/Controllers/WhiteboardManager.cpp
index 1aa238e..bb73ae3 100644
--- a/Swift/Controllers/WhiteboardManager.cpp
+++ b/Swift/Controllers/WhiteboardManager.cpp
@@ -13,14 +13,20 @@
 #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>
 #include <Swiften/Whiteboard/WhiteboardSessionManager.h>
 
 namespace Swift {
 	typedef std::pair<JID, WhiteboardWindow*> JIDWhiteboardWindowPair;
 
-	WhiteboardManager::WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, UIEventStream* uiEventStream, NickResolver* nickResolver, WhiteboardSessionManager* whiteboardSessionManager) : whiteboardWindowFactory_(whiteboardWindowFactory), uiEventStream_(uiEventStream), nickResolver_(nickResolver), whiteboardSessionManager_(whiteboardSessionManager) {
+	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));
 		uiEventConnection_ = uiEventStream_->onUIEvent.connect(boost::bind(&WhiteboardManager::handleUIEvent, this, _1));
 	}
 
@@ -66,10 +72,7 @@ namespace Swift {
 		}
 		boost::shared_ptr<ShowWhiteboardUIEvent> showWindowEvent = boost::dynamic_pointer_cast<ShowWhiteboardUIEvent>(event);
 		if (showWindowEvent) {
-			WhiteboardWindow* window = findWhiteboardWindow(showWindowEvent->getContact());
-			if (window != NULL) {
-				window->activateWindow();
-			}
+			activateWindow(showWindowEvent->getContact());
 		}
 	}
 
@@ -93,4 +96,25 @@ namespace Swift {
 			session->cancel();
 		}
 	}
+
+	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();
+		}
+	}
 }
diff --git a/Swift/Controllers/WhiteboardManager.h b/Swift/Controllers/WhiteboardManager.h
index a2c75dd..98ee1cd 100644
--- a/Swift/Controllers/WhiteboardManager.h
+++ b/Swift/Controllers/WhiteboardManager.h
@@ -20,26 +20,34 @@
 
 namespace Swift {
 	class WhiteboardSessionManager;
+	class ChatListWindowFactory;
+	class ChatListWindow;
 	class NickResolver;
+	class AvatarManager;
 
 	class WhiteboardManager {
 	public:
-		WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, UIEventStream* uiEventStream, NickResolver* nickResolver, WhiteboardSessionManager* whiteboardSessionManager);
+		WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, ChatListWindowFactory* chatListWindowFactory, UIEventStream* uiEventStream, NickResolver* nickResolver, AvatarManager* avatarManager, WhiteboardSessionManager* whiteboardSessionManager);
 		~WhiteboardManager();
 
 		WhiteboardWindow* createNewWhiteboardWindow(const JID& contact, WhiteboardSession::ref session);
 
 	private:
 		void handleUIEvent(boost::shared_ptr<UIEvent> event);
+		void handleSessionAccepted(const JID& from);
+		void handleSessionTerminated(const JID& from);
 		void acceptSession(const JID& from);
 		void cancelSession(const JID& from);
 		WhiteboardWindow* findWhiteboardWindow(const JID& contact);
+		void activateWindow(const JID& jid);
 
 	private:
 		std::map<JID, WhiteboardWindow*> whiteboardWindows_;
 		WhiteboardWindowFactory* whiteboardWindowFactory_;
+		ChatListWindow* chatListWindow_;
 		UIEventStream* uiEventStream_;
 		NickResolver* nickResolver_;
+		AvatarManager* avatarManager_;
 		boost::bsignals::scoped_connection uiEventConnection_;
 		WhiteboardSessionManager* whiteboardSessionManager_;
 	};