added colorsettingspage

[quassel.git] / src / uisupport / bufferview.cpp

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 3b9f657..840f5d7 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -83,15 +83,14 @@ void BufferView::setModel(QAbstractItemModel *model) {
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
+  BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
-  if(bufferType != BufferItem::ChannelType)
+  if(bufferType != BufferInfo::ChannelBuffer)
     return;
 
   BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   
-  Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.buffer()));
-  // Client::fakeInput(index.data(NetworkModel::BufferIdRole).value<BufferId>(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {