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

List:       kde-commits
Subject:    KDE_3_4_BRANCH: kdebase/konqueror
From:       Stephan Binner <binner () kde ! org>
Date:       2005-04-20 7:20:44
Message-ID: 20050420072044.E69D2653 () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Bug 104227: address bar encryption color stays when using back/forward


  M +5 -1      konq_view.cc   1.362.2.2
  M +1 -0      konq_view.h   1.174.2.1


--- kdebase/konqueror/konq_view.cc  #1.362.2.1:1.362.2.2
@@ -743,4 +743,5 @@ void KonqView::updateHistoryEntry( bool 
 #endif
     current->locationBarURL = m_sLocationBarURL;
+    current->pageSecurity = m_pageSecurity;
   }
 #ifdef DEBUG_HISTORY
@@ -814,4 +815,5 @@ void KonqView::restoreHistory()
 #endif
   setLocationBarURL( h.locationBarURL );
+  setPageSecurity( h.pageSecurity );
   m_sTypedURL = QString::null;
   if ( ! changeViewMode( h.strServiceType, h.strServiceName ) )
@@ -927,6 +929,8 @@ void KonqView::stop()
     // This is duplicated with KonqMainWindow::slotRunFinished, but we can't call it
     //   since it relies on sender()...
-    if ( history().current() && m_pRun->typedURL().isEmpty() ) // not typed
+    if ( history().current() && m_pRun->typedURL().isEmpty() ) { // not typed
       setLocationBarURL( history().current()->locationBarURL );
+      setPageSecurity( history().current()->pageSecurity );
+    }
 
     setRun( 0L );

--- kdebase/konqueror/konq_view.h  #1.174:1.174.2.1
@@ -55,4 +55,5 @@ struct HistoryEntry
   bool doPost;
   QString pageReferrer;
+  KonqMainWindow::PageSecurity pageSecurity;
 };
 


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