CVS commit by binner: Bug 104227: address bar encryption color stays when using back/forward M +5 -1 konq_view.cc 1.366 M +1 -0 konq_view.h 1.176 --- kdebase/konqueror/konq_view.cc #1.365:1.366 @@ -753,4 +753,5 @@ void KonqView::updateHistoryEntry( bool #endif current->locationBarURL = m_sLocationBarURL; + current->pageSecurity = m_pageSecurity; } #ifdef DEBUG_HISTORY @@ -824,4 +825,5 @@ void KonqView::restoreHistory() #endif setLocationBarURL( h.locationBarURL ); + setPageSecurity( h.pageSecurity ); m_sTypedURL = QString::null; if ( ! changeViewMode( h.strServiceType, h.strServiceName ) ) @@ -937,6 +939,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.175:1.176 @@ -55,4 +55,5 @@ struct HistoryEntry bool doPost; QString pageReferrer; + KonqMainWindow::PageSecurity pageSecurity; };