1 files changed, 6 insertions, 12 deletions
diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
index b991e52..e0e68ba 100644
--- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
+++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
@@ -10,13 +10,13 @@
 
 #include <boost/bind.hpp>
 
-#include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/Whiteboard/WhiteboardSession.h>
 #include <Swiften/Elements/WhiteboardPayload.h>
 
 using namespace std;
 
 namespace Swift {
-	QtWhiteboardWindow::QtWhiteboardWindow(StanzaChannel* stanzaChannel, const JID& jid) : QWidget(), stanzaChannel_(stanzaChannel), jid_(jid) {
+	QtWhiteboardWindow::QtWhiteboardWindow(WhiteboardSession* whiteboardSession) : QWidget(), whiteboardSession_(whiteboardSession) {
 		layout = new QVBoxLayout(this);
 		hLayout = new QHBoxLayout;
 		sidebarLayout = new QVBoxLayout;
@@ -121,14 +121,7 @@ namespace Swift {
 		layout->addLayout(hLayout);
 		this->setLayout(layout);
 
-		stanzaChannel_->onMessageReceived.connect(boost::bind(&QtWhiteboardWindow::handleIncommingMessage, this, _1));
-	}
-
-	void QtWhiteboardWindow::handleIncommingMessage(boost::shared_ptr<Message> message) {
-		boost::shared_ptr<WhiteboardPayload> wb = message->getPayload<WhiteboardPayload>();
-		if(wb) {
-			addItem(wb->getData());
-		}
+		whiteboardSession_->onDataReceived.connect(boost::bind(&QtWhiteboardWindow::addItem, this, _1));		
 	}
 
 	void QtWhiteboardWindow::addItem(const std::string& item) {
@@ -259,13 +252,14 @@ namespace Swift {
 		}
 		if (!serialized.empty()) {
 			cout << "serialized: " << serialized << endl;
-			boost::shared_ptr<Message> mes(new Message());
+/*			boost::shared_ptr<Message> mes(new Message());
 			mes->setTo(jid_);
 			boost::shared_ptr<WhiteboardPayload> wbPayload(new WhiteboardPayload);
 			wbPayload->setData(serialized);
 //		mes->setType(Swift::Message::Chat);
 			mes->addPayload(wbPayload);
-			stanzaChannel_->sendMessage(mes);
+//			stanzaChannel_->sendMessage(mes);*/
+			whiteboardSession_->sendData(serialized);
 		}
 
 	}