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

List:       kde-commits
Subject:    KDE/kdebase/konqueror
From:       David Faure <faure () kde ! org>
Date:       2005-08-28 9:04:18
Message-ID: 1125219858.644657.17279.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 454175 by dfaure:

Send KParts::OpenURLEvent before opening the URL, not right after (which is a rather
undefined moment since the loading is async). This makes it possible to get the old URL
as well. As discussed with Keith Hans for his SOC project.


 _M            dirpart (directory)  
 M  +6 -10     konq_view.cc  
 M  +1 -1      konq_view.h  


** trunk/KDE/kdebase/konqueror/dirpart #property changes
Name: svn:ignore
   + .libs
Makefile
Makefile.in
*.moc
--- trunk/KDE/kdebase/konqueror/konq_view.cc #454174:454175
@@ -215,7 +215,6 @@
     m_pageReferrer = args.metaData()["referrer"];
   }
 
-  m_bAborted = false;
   if ( tempFile ) {
       // Store the path to the tempfile. Yes, we could store a bool only,
       // but this would be more dangerous. If anything goes wrong in the code,
@@ -226,10 +225,10 @@
           kdWarning(1202) << "Tempfile option is set, but URL is remote: " << url << endl;
   }
 
+  aboutToOpenURL( url, args );
+
   m_pPart->openURL( url );
 
-  sendOpenURLEvent( url, args );
-
   updateHistoryEntry(false /* don't save location bar URL yet */);
   // add pending history entry
   KonqHistoryManager::kself()->addPending( url, locationBarURL, QString::null);
@@ -844,10 +843,10 @@
     return /*false*/;
   }
 
-  m_bAborted = false;
-
   setServiceTypeInExtension();
 
+  aboutToOpenURL( h.url );
+
   if ( browserExtension() )
   {
     //kdDebug(1202) << "Restoring view from stream" << endl;
@@ -863,8 +862,6 @@
   else
     m_pPart->openURL( h.url );
 
-  sendOpenURLEvent( h.url );
-
   if ( m_pMainWindow->currentView() == this )
     m_pMainWindow->updateToolBarActions();
 
@@ -1008,14 +1005,13 @@
   m_bLockedLocation = b;
 }
 
-void KonqView::sendOpenURLEvent( const KURL &url, const KParts::URLArgs &args )
+void KonqView::aboutToOpenURL( const KURL &url, const KParts::URLArgs &args )
 {
   KParts::OpenURLEvent ev( m_pPart, url, args );
   QApplication::sendEvent( m_pMainWindow, &ev );
 
-  // We also do here what we want to do after opening an URL, whether a new one
-  // or one from the history (common stuff).
   m_bGotIconURL = false;
+  m_bAborted = false;
 }
 
 void KonqView::setServiceTypeInExtension()
--- trunk/KDE/kdebase/konqueror/konq_view.h #454174:454175
@@ -410,7 +410,7 @@
    */
   void updateHistoryEntry(bool saveLocationBarURL);
 
-  void sendOpenURLEvent( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
+  void aboutToOpenURL( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
 
   void setServiceTypeInExtension();
 
[prev in list] [next in list] [prev in thread] [next in thread]