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

List:       kde-commits
Subject:    kdelibs/khtml
From:       Waldo Bastian <bastian () kde ! org>
Date:       2002-12-11 20:03:17
[Download RAW message or body]

CVS commit by waba: 

Move kapp->authorizeURLAction() to proper place


  M +7 -5      khtml_part.cpp   1.781


--- kdelibs/khtml/khtml_part.cpp  #1.780:1.781
@@ -1732,9 +1732,4 @@ void KHTMLPart::scheduleRedirection( int
   //kdDebug(6050) << "KHTMLPart::scheduleRedirection delay=" << delay << " url=" << \
url << endl;  if( d->m_redirectURL.isEmpty() || delay < d->m_delayRedirect ) {
-    if (!kapp || !kapp->kapp->authorizeURLAction("redirect", m_url, url)) {
-      kdWarning(6050) << "KHTMLPart::scheduleRedirection: Redirection from " << \
                m_url.prettyURL() << " to " << url << " REJECTED!" << endl;
-      return;
-    }
-
     d->m_delayRedirect = delay;
     d->m_redirectURL = url;
@@ -1769,4 +1764,11 @@ void KHTMLPart::slotRedirect()
   // But jumping to an anchor never leads to a reload.
   KURL url( u );
+
+  if (!kapp || !kapp->kapp->authorizeURLAction("redirect", m_url, url))
+  {
+    kdWarning(6050) << "KHTMLPart::scheduleRedirection: Redirection from " << \
m_url.prettyURL() << " to " << url.prettyURL() << " REJECTED!" << endl; +    return;
+  }
+
   if ( !url.hasRef() && urlcmp( u, m_url.url(), true, true ) )
   {


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