X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffertreemodel.cpp;h=b93f85848fba287766667c38b924d9da3bc380ca;hp=54ef7a876cec79d383380178714ecbc5c0134e59;hb=f8d0e2599bcce55e49f1f92cc7415806e3ff551b;hpb=0555b01cbb4789122de7bc0a5325c664fbed87cd

diff --git a/src/client/buffertreemodel.cpp b/src/client/buffertreemodel.cpp
index 54ef7a87..b93f8584 100644
--- a/src/client/buffertreemodel.cpp
+++ b/src/client/buffertreemodel.cpp
@@ -20,8 +20,9 @@
 
 #include <QColor>  // FIXME Dependency on QtGui!
 
-#include "clientproxy.h"
+#include "client.h"
 #include "buffertreemodel.h"
+#include "signalproxy.h"
 
 /*****************************************
 *  Fancy Buffer Items
@@ -116,8 +117,7 @@ Qt::ItemFlags NetworkTreeItem::flags() const {
 BufferTreeModel::BufferTreeModel(QObject *parent)
   : TreeModel(BufferTreeModel::defaultHeader(), parent)
 {
-  connect(this, SIGNAL(fakeUserInput(BufferId, QString)),
-          ClientProxy::instance(), SLOT(gsUserInput(BufferId, QString)));
+  Client::signalProxy()->attachSignal(this, SIGNAL(fakeUserInput(BufferId, QString)), SIGNAL(sendInput(BufferId, QString)));
 }
 
 QList<QVariant >BufferTreeModel::defaultHeader() {
@@ -256,7 +256,6 @@ void BufferTreeModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buffer
 
 void BufferTreeModel::selectBuffer(Buffer *buffer) {
   QModelIndex index = getOrCreateBufferItemIndex(buffer);
-  emit selectionChanged(index);
+  //emit selectionChanged(index);
+  changeCurrent(index, QModelIndex());
 }
-
-