dolphinview fix: don't emit urlChanged twice in DolphinView::setUrl (it's already emitted by the controller, and we forward that)

dolphinpart fix: don't let the konq wheel spin forever when clicking on the Home button and we're already viewing $HOME.

svn path=/trunk/KDE/kdebase/apps/; revision=705916

1 files changed, 5 insertions, 1 deletions

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 5d52c78a8..1bc1edac0 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -107,9 +107,13 @@ bool DolphinPart::openUrl(const KUrl& url)
     const QString prettyUrl = url.pathOrUrl();
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
+    const bool reload = arguments().reload();
+    if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
+        return true;
+    }
     setUrl(url); // remember it at the KParts level
     m_view->setUrl(url);
-    if (arguments().reload())
+    if (reload)
         m_view->reload();
     emit started(0); // get the wheel to spin
     return true;