From c503452d56003ddb05e3266865abf02b04e0b785 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Mon, 29 Oct 2012 20:54:53 +0100 Subject: Fix Bug 153984 - Clicking cancel on the authentication dialog for fish/sftp/ftp kioslave gets dolphin stuck on "Loading folder" BUG: 153984 REVIEW: 107116 --- src/kitemviews/kfileitemmodel.cpp | 2 ++ src/kitemviews/kfileitemmodel.h | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'src/kitemviews') diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 61f512a8e..231bfe077 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -716,6 +716,8 @@ void KFileItemModel::slotCanceled() { m_maximumUpdateIntervalTimer->stop(); dispatchPendingItemsToInsert(); + + emit directoryLoadingCanceled(); } void KFileItemModel::slotNewItems(const KFileItemList& items) diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 5bcebce24..ef9dc98b9 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -216,6 +216,11 @@ signals: */ void directoryLoadingCompleted(); + /** + * Is emitted after the loading of a directory has been canceled. + */ + void directoryLoadingCanceled(); + /** * Informs about the progress in percent when loading a directory. It is assured * that the signal directoryLoadingStarted() has been emitted before. -- cgit v1.3