[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdelibs/kfile
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2008-07-19 15:21:22
Message-ID: 1216480882.860300.13932.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 834753 by ppenz:

Backport of 834752 for 4.1: If an invalid URL has been set, the check whether the URL \
has already been entered failed because KUrl::equals() always returns false if at \
least one URL is invalid (even if both invalid URLs are equal). This has lead to an \
endless recursion in Dolphin as Dolphin relies on that invoking \
KUrlNavigator::setUrl() with the same URL twice does not emit 2 urlsChanged() \
signals.

CCBUG: 166543
CCBUG: 166281

 M  +3 -1      kurlnavigator.cpp  


--- branches/KDE/4.1/kdelibs/kfile/kurlnavigator.cpp #834752:834753
@@ -1041,7 +1041,9 @@
     // Check whether current history element has the same URL.
     // If this is the case, just ignore setting the URL.
     const HistoryElem& historyElem = d->m_history[d->m_historyIndex];
-    if (transformedUrl.equals(historyElem.url(), KUrl::CompareWithoutTrailingSlash)) \
{ +    const bool isUrlEqual = transformedUrl.equals(historyElem.url(), \
KUrl::CompareWithoutTrailingSlash) || +                            \
!transformedUrl.isValid() && (urlStr == historyElem.url().url()); +    if \
(isUrlEqual) {  return;
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]