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/views/dolphinview.cpp | 1 + src/views/dolphinview.h | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'src/views') 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)), 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 @@ -483,6 +483,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. -- cgit v1.3