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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       David Faure <faure () kde ! org>
Date:       2008-09-12 19:05:05
Message-ID: 1221246305.659169.19860.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 860346 by dfaure:

Revert commit 44537 from March 2000 :-)
In other words, jumping to anchors is entirely handled by KHTML nowadays, and this \
test in konq was a bit wrong and broke 1644495 (already fixed) and now 166389.


 M  +4 -23     konqmainwindow.cpp  


--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.cpp #860345:860346
@@ -1008,29 +1008,10 @@
 void KonqMainWindow::openUrlRequestHelper( KonqView *childView, const KUrl &url, \
const KParts::OpenUrlArguments& args, const KParts::BrowserArguments &browserArgs )  \
{  //kDebug(1202) << "url=" << url;
-  KonqOpenURLRequest req;
-  req.args = args;
-  req.browserArgs = browserArgs;
-
-  // Clicking on a link that points to the page itself (e.g. anchor)
-  if ( !browserArgs.doPost() && !args.reload() &&
-       childView && !childView->aborted() && // #164495
-       urlcmp( url.url(), childView->url().url(),
-               KUrl::CompareWithoutTrailingSlash | KUrl::CompareWithoutFragment ) )
-  {
-    QString serviceType = args.mimeType();
-    if ( serviceType.isEmpty() )
-      serviceType = childView->serviceType();
-
-    childView->stop();
-    req.forceAutoEmbed = true;
-
-    req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
-    openView( serviceType, url, childView, req );
-    return;
-  }
-
-  openUrl( childView, url, args.mimeType(), req, browserArgs.trustedSource );
+    KonqOpenURLRequest req;
+    req.args = args;
+    req.browserArgs = browserArgs;
+    openUrl(childView, url, args.mimeType(), req, browserArgs.trustedSource);
 }
 
 QObject *KonqMainWindow::lastFrame( KonqView *view )


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