┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews
diff options
context:
space:
mode:
authorEmmanuel Pescosta <[email protected]>2012-10-29 20:54:53 +0100
committerEmmanuel Pescosta <[email protected]>2012-10-29 20:54:53 +0100
commitc503452d56003ddb05e3266865abf02b04e0b785 (patch)
tree3feddcbb1e71b84b4d73767c853f82e5676b989e /src/kitemviews
parent726cd768c9dbae4f560535129ef8da5a9a72d050 (diff)
Fix Bug 153984 - Clicking cancel on the authentication dialog for fish/sftp/ftp kioslave gets dolphin stuck on "Loading folder"
BUG: 153984 REVIEW: 107116
Diffstat (limited to 'src/kitemviews')
-rw-r--r--src/kitemviews/kfileitemmodel.cpp2
-rw-r--r--src/kitemviews/kfileitemmodel.h5
2 files changed, 7 insertions, 0 deletions
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
@@ -217,6 +217,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.
*/