X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=840f5d7e6fdaef417c6e6fe7e7b86abdec6ea335;hp=37d0be5221ff5c6f3485f255c0731cbfda97b4f3;hb=5b560ec1a01349562ac58051ca7e7fa899d4b994;hpb=03896bdccdc8caf15bbce736680ba0f12bc2dc31

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 37d0be52..840f5d7e 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "client.h"
-//#include "buffer.h"
 #include "bufferview.h"
 #include "networkmodel.h"
 
@@ -84,12 +83,14 @@ void BufferView::setModel(QAbstractItemModel *model) {
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).toInt();
+  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::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) {