summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-09-10 16:53:30 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-09-10 16:53:30 (GMT)
commitdd38b017c12478ef1cc4db37c1e8219e3151742f (patch)
treebeff183339f9f5fc2321843636d3063c622b34dc /Swift
parentfae0452c89cc18d786b4a560c9059c42177525ff (diff)
downloadswift-dd38b017c12478ef1cc4db37c1e8219e3151742f.zip
swift-dd38b017c12478ef1cc4db37c1e8219e3151742f.tar.bz2
Remove whiteboard from non experimental.
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/ChatList/ChatListModel.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/ChatList/ChatListModel.cpp b/Swift/QtUI/ChatList/ChatListModel.cpp
index 15f4dfe..7913c61 100644
--- a/Swift/QtUI/ChatList/ChatListModel.cpp
+++ b/Swift/QtUI/ChatList/ChatListModel.cpp
@@ -12,14 +12,17 @@
namespace Swift {
-ChatListModel::ChatListModel() {
+ChatListModel::ChatListModel() : whiteboards_(NULL) {
root_ = new ChatListGroupItem("", NULL, false);
mucBookmarks_ = new ChatListGroupItem(tr("Bookmarked Rooms"), root_);
recents_ = new ChatListGroupItem(tr("Recent Chats"), root_, false);
+#ifdef SWIFT_EXPERIMENTAL_WB
whiteboards_ = new ChatListGroupItem(tr("Opened Whiteboards"), root_, false);
+ root_->addItem(whiteboards_);
+#endif
+
root_->addItem(recents_);
root_->addItem(mucBookmarks_);
- root_->addItem(whiteboards_);
}
void ChatListModel::clearBookmarks() {