X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fbufferviewwidget.cpp;h=e21b98baece95cd87d8b46b65450a49470b8b695;hp=31023f747cf4e49724181e620dddcc65a4ea70f9;hb=62f292ad143923a3b774b9bd14f83f3b640c0cb8;hpb=6fc26e28a07a2b6bbc60ee786514a802e628d6d3

diff --git a/gui/bufferviewwidget.cpp b/gui/bufferviewwidget.cpp
index 31023f74..e21b98ba 100644
--- a/gui/bufferviewwidget.cpp
+++ b/gui/bufferviewwidget.cpp
@@ -331,6 +331,16 @@ bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
   Buffer *sourceBuffer = static_cast<BufferTreeItem *>(networkItem[network]->child(sourcerow))->buffer();
   Buffer *targetBuffer = getBufferByIndex(parent);
   
+  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));
@@ -398,6 +408,5 @@ BufferViewDock::BufferViewDock(QAbstractItemModel *model, QString viewname, Buff
 
   BufferViewWidget *viewWidget = new BufferViewWidget(this);
   viewWidget->treeView()->setFilteredModel(model, mode, nets);
-  viewWidget->treeView()->init();
   setWidget(viewWidget);
 }