diff options
| author | Peter Penz <[email protected]> | 2012-01-27 21:52:29 +0100 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2012-01-27 22:02:42 +0100 |
| commit | f8f5cf8760fbed119c7a171506c9c43b31d56e15 (patch) | |
| tree | 79a7ed0a34299b9eb64d2ec3b0970b48678cb22a /src/views/dolphinview.cpp | |
| parent | 05fec8d24bcfbcb7bccc923df95776c4dc89e99d (diff) | |
Fix regression: Allow dragging items on a tab
BUG: 292505
FIXED-IN: 4.8.1
Diffstat (limited to 'src/views/dolphinview.cpp')
| -rw-r--r-- | src/views/dolphinview.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 83d80012c..539fcaacc 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -863,16 +863,6 @@ void DolphinView::emitSelectionChangedSignal() emit selectionChanged(selectedItems()); } -void DolphinView::dropUrls(const KFileItem& destItem, - const KUrl& destPath, - QDropEvent* event) -{ - Q_UNUSED(destItem); - Q_UNUSED(destPath); - markPastedUrlsAsSelected(event->mimeData()); - //DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this); -} - void DolphinView::updateSorting(DolphinView::Sorting sorting) { ViewProperties props(url()); @@ -969,7 +959,12 @@ bool DolphinView::hasSelection() const KFileItem DolphinView::rootItem() const { - return m_dirLister->rootItem(); + KFileItem item = m_dirLister->rootItem(); + if (item.isNull()) { + // The directory has not been loaded yet + item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url()); + } + return item; } void DolphinView::observeCreatedItem(const KUrl& url) |