1 files changed, 15 insertions, 1 deletions
diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp
index cbfa687..1061e78 100644
--- a/Swift/Controllers/HistoryViewController.cpp
+++ b/Swift/Controllers/HistoryViewController.cpp
@@ -8,10 +8,19 @@
 
 #include <Swift/Controllers/UIInterfaces/HistoryWindowFactory.h>
 #include <Swift/Controllers/UIEvents/RequestHistoryUIEvent.h>
+#include <Swift/Controllers/HistoryController.h>
+#include <Swiften/History/HistoryMessage.h>
 
 namespace Swift {
 
-HistoryViewController::HistoryViewController(UIEventStream* uiEventStream, HistoryWindowFactory* historyWindowFactory) : uiEventStream_(uiEventStream), historyWindowFactory_(historyWindowFactory), historyWindow_(NULL) {
+HistoryViewController::HistoryViewController(
+		UIEventStream* uiEventStream,
+		HistoryController* historyController,
+		HistoryWindowFactory* historyWindowFactory) :
+			uiEventStream_(uiEventStream),
+			historyController_(historyController),
+			historyWindowFactory_(historyWindowFactory),
+			historyWindow_(NULL) {
 	uiEventStream_->onUIEvent.connect(boost::bind(&HistoryViewController::handleUIEvent, this, _1));
 }
 
@@ -37,6 +46,11 @@ void HistoryViewController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) {
 			roster_->addContact(medvedev, medvedev, "Dmitri Medvedev", "Recent", "");
 			roster_->addContact(kev, kev, "Kev", "Recent", "");
 		}
+
+		std::vector<HistoryMessage> messages = historyController_->getMessages();
+		for (std::vector<HistoryMessage>::iterator it = messages.begin(); it != messages.end(); it++) {
+			historyWindow_->addMessage(*it);
+		}
 		historyWindow_->activate();
 	}
 }