X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=gui%2Fbufferviewwidget.cpp;h=04331c387911c56d0c59f46d10a36953bf5989da;hb=4ccba157efd91e531a3106012f5d54ba372a0292;hp=e21b98baece95cd87d8b46b65450a49470b8b695;hpb=62f292ad143923a3b774b9bd14f83f3b640c0cb8;p=quassel.git

diff --git a/gui/bufferviewwidget.cpp b/gui/bufferviewwidget.cpp
index e21b98ba..04331c38 100644
--- a/gui/bufferviewwidget.cpp
+++ b/gui/bufferviewwidget.cpp
@@ -155,7 +155,7 @@ BufferTreeModel::BufferTreeModel(QObject *parent) : QAbstractItemModel(parent) {
   rootData << "Buffer" << "Network";
   rootItem = new TreeItem(rootData, 0);
   
-  connect(this, SIGNAL(fakeUserInput(BufferId, QString)), guiProxy, SLOT(gsUserInput(BufferId, QString)));
+  connect(this, SIGNAL(fakeUserInput(BufferId, QString)), ClientProxy::instance(), SLOT(gsUserInput(BufferId, QString)));
 }
 
 BufferTreeModel::~BufferTreeModel() {
@@ -291,11 +291,11 @@ QModelIndex BufferTreeModel::getOrCreateBufferItemIndex(Buffer *buffer) {
     TreeItem *networkItem = static_cast<TreeItem*>(networkItemIndex.internalPointer());
 
     int nextRow = networkItem->childCount();
-    
+
     beginInsertRows(networkItemIndex, nextRow, nextRow);
     networkItem->appendChild(new BufferTreeItem(buffer, networkItem));
     endInsertRows();
-                         
+
     bufferItem[buffer] = static_cast<BufferTreeItem *>(networkItem->child(nextRow));
     return index(nextRow, 0, networkItemIndex);
   }
@@ -334,13 +334,14 @@ bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
   if(sourceBuffer == targetBuffer) // we won't merge with ourself :)
     return false;
   
-  
+  /*
   if(QMessageBox::warning(static_cast<QWidget *>(QObject::parent()),
                           tr("Merge Buffers?"),
                           tr("Do you really want to merge the following Buffers?<br />%1.%2<br />%3.%4").arg(sourceBuffer->networkName()).arg(sourceBuffer->bufferName()).arg(targetBuffer->networkName()).arg(targetBuffer->bufferName()),
                           QMessageBox::Yes|QMessageBox::No) == QMessageBox::No)
     return false;
-    
+
+  */
   qDebug() << "merging" << sourceBuffer->bufferName() << "with" << targetBuffer->bufferName();
   bufferItem.remove(getBufferByIndex(parent));
   removeRow(parent.row(), BufferTreeModel::parent(parent));