diff options
| author | Peter Penz <[email protected]> | 2012-01-27 21:52:29 +0100 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2012-01-27 22:01:05 +0100 |
| commit | a4553c9747365fdd96d7c4a24b80fb74a31a9d05 (patch) | |
| tree | dc936c6864b2e98edcbbead37a6cc41205c8a37f /src/views/dolphinview.cpp | |
| parent | 329f6009a802428481b5b0955f70b7fbe60a5148 (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) |