1 files changed, 22 insertions, 10 deletions
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index b532cdb..9beb9dc 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -10,9 +10,11 @@
 #include <QContextMenuEvent>
 
 #include "Swift/QtUI/ChatList/ChatListMUCItem.h"
+#include "Swift/QtUI/ChatList/ChatListRecentItem.h"
 #include "Swift/QtUI/QtAddBookmarkWindow.h"
 #include "Swift/QtUI/QtEditBookmarkWindow.h"
 #include "Swift/Controllers/UIEvents/JoinMUCUIEvent.h"
+#include "Swift/Controllers/UIEvents/RequestChatUIEvent.h"
 #include "Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h"
 #include "Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h"
 #include "Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h"
@@ -68,19 +70,21 @@ void QtChatListWindow::setupContextMenus() {
 }
 
 void QtChatListWindow::handleItemActivated(const QModelIndex& index) {
-	if (!bookmarksEnabled_) {
-		return;
-	}
 	ChatListItem* item = model_->getItemForIndex(index);
-	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(item);
-	if (mucItem) {
-		boost::shared_ptr<UIEvent> event(new JoinMUCUIEvent(mucItem->getBookmark().getRoom(), mucItem->getBookmark().getNick()));
-		eventStream_->send(event);
+	if (ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(item)) {
+		if (bookmarksEnabled_) {
+			onMUCBookmarkActivated(mucItem->getBookmark());
+		}
+	}
+	else if (ChatListRecentItem* recentItem = dynamic_cast<ChatListRecentItem*>(item)) {
+		if (!recentItem->getChat().isMUC || bookmarksEnabled_) {
+			onRecentActivated(recentItem->getChat());
+		}
 	}
 }
 
-void QtChatListWindow::clear() {
-	model_->clear();
+void QtChatListWindow::clearBookmarks() {
+	model_->clearBookmarks();
 }
 
 void QtChatListWindow::addMUCBookmark(const MUCBookmark& bookmark) {
@@ -91,6 +95,14 @@ void QtChatListWindow::removeMUCBookmark(const MUCBookmark& bookmark) {
 	model_->removeMUCBookmark(bookmark);
 }
 
+void QtChatListWindow::setRecents(const std::list<ChatListWindow::Chat>& recents) {
+	model_->setRecents(recents);
+}
+
+void QtChatListWindow::setUnreadCount(int unread) {
+	emit onCountUpdated(unread);
+}
+
 void QtChatListWindow::handleRemoveBookmark() {
 	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(contextMenuItem_);
 	if (!mucItem) return;