[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps/konqueror/src
From: Germain Garand <germain () ebooksfrance ! com>
Date: 2007-07-23 0:59:37
Message-ID: 1185152377.661517.23438.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 691145 by ggarand:
reinstating patch by Hasso Tepper that was once reverted for BIC problems,
then forgotten.
(kdebase part)
BUG: 66958
M +1 -1 konqmainwindow.cpp
M +5 -2 konqview.cpp
M +1 -1 konqview.h
--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.cpp #691144:691145
@@ -1773,7 +1773,7 @@
KonqOpenURLRequest req( reloadView->typedUrl() );
req.userRequestedReload = true;
- if ( reloadView->prepareReload( req.args ) )
+ if ( reloadView->prepareReload( req.args, true /* softReload */ ) )
{
reloadView->lockHistory();
// Reuse current servicetype for local files, but not for remote files (it \
could have changed, e.g. over HTTP)
--- trunk/KDE/kdebase/apps/konqueror/src/konqview.cpp #691144:691145
@@ -171,7 +171,7 @@
// Typing "Enter" again after the URL of an aborted view, triggers a reload.
if ( m_bAborted && m_pPart && m_pPart->url() == url && !args.doPost())
{
- if ( !prepareReload( args ) )
+ if ( !prepareReload( args, false /* not softReload */ ) )
return;
if ( ext )
ext->setUrlArgs( args );
@@ -1327,9 +1327,12 @@
KGlobal::setActiveComponent( m_pPart->componentData() );
}
-bool KonqView::prepareReload( KParts::URLArgs& args )
+bool KonqView::prepareReload( KParts::URLArgs& args, bool softReload )
{
args.reload = true;
+ if ( softReload )
+ args.softReload = true;
+
// Repost form data if this URL is the result of a POST HTML form.
if ( m_doPost && !args.redirectedRequest() )
{
--- trunk/KDE/kdebase/apps/konqueror/src/konqview.h #691144:691145
@@ -319,7 +319,7 @@
// Called before reloading this view. Sets args.reload to true, and offers to \
repost form data. // Returns false in case the reload must be canceled.
- bool prepareReload( KParts::URLArgs& args );
+ bool prepareReload( KParts::URLArgs& args, bool softReload );
// overload for the QString version
void setLocationBarURL( const KUrl& locationBarURL );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic