From 81b65f9fe655e291ae7b547fd8b649791cddf41e Mon Sep 17 00:00:00 2001 From: Kimmo Huoman Date: Mon, 2 Feb 2015 14:13:51 +0200 Subject: [PATCH 1/1] Allows merging buffers over networks Feature request at http://bugs.quassel-irc.org/issues/1334 > As stated in Issue 83 merge is only possible with chats on the > same network. > As the usage of Bitlbee etc has increased, it would be useful > to be able to merge chats across all networks as well. The issue > rises as people are now using alternative methods (Facebook, Lync > etc) during the day and returning to IRC in the evening. Closes #1334 --- src/uisupport/bufferview.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 7973785e..d0921466 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -253,7 +253,6 @@ void BufferView::dropEvent(QDropEvent *event) if (bufferList.count() != 1) return QTreeView::dropEvent(event); - NetworkId networkId = bufferList[0].first; BufferId bufferId2 = bufferList[0].second; if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) @@ -262,9 +261,6 @@ void BufferView::dropEvent(QDropEvent *event) if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer) return QTreeView::dropEvent(event); - if (index.data(NetworkModel::NetworkIdRole).value() != networkId) - return QTreeView::dropEvent(event); - BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value(); if (bufferId1 == bufferId2) return QTreeView::dropEvent(event); -- 2.20.1