┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views
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/views
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/views')
-rw-r--r--src/views/dolphinview.cpp1
-rw-r--r--src/views/dolphinview.h6
2 files changed, 7 insertions, 0 deletions
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 9051d9827..67045032d 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -154,6 +154,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
connect(m_model, SIGNAL(directoryLoadingStarted()), this, SLOT(slotDirectoryLoadingStarted()));
connect(m_model, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
+ connect(m_model, SIGNAL(directoryLoadingCanceled()), this, SIGNAL(directoryLoadingCanceled()));
connect(m_model, SIGNAL(directoryLoadingProgress(int)), this, SIGNAL(directoryLoadingProgress(int)));
connect(m_model, SIGNAL(directorySortingProgress(int)), this, SIGNAL(directorySortingProgress(int)));
connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 7d8e8b76a..1feaf0f11 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -484,6 +484,12 @@ signals:
void directoryLoadingCompleted();
/**
+ * Is emitted after the directory loading triggered by DolphinView::setUrl()
+ * has been canceled.
+ */
+ void directoryLoadingCanceled();
+
+ /**
* Is emitted after DolphinView::setUrl() has been invoked and provides
* the information how much percent of the current directory have been loaded.
*/