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

List:       kde-commits
Subject:    /
From:       Stephan Binner <binner () kde ! org>
Date:       2004-01-03 22:35:17
Message-ID: 20040103223517.DD792942D () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Bug 71475: "Open in new window" in frame sub RMB menu opens page in new tab


  M +2 -1      kdebase/konqueror/konq_mainwindow.cc   1.1272
  M +1 -0      kdelibs/khtml/khtml_ext.cpp   1.83


--- kdelibs/khtml/khtml_ext.cpp  #1.82:1.83
@@ -498,4 +498,5 @@ void KHTMLPopupGUIClient::slotFrameInWin
   KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
   args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  args.metaData()["forcenewwindow"] = "true";
   emit d->m_khtml->browserExtension()->createNewWindow( d->m_khtml->url(), args );
 }

--- kdebase/konqueror/konq_mainwindow.cc  #1.1271:1.1272
@@ -1000,5 +1000,6 @@ void KonqMainWindow::slotCreateNewWindow
     KConfig *config = KGlobal::config();
     KConfigGroupSaver cs( config, QString::fromLatin1("FMSettings") );
-    if ( args.newTab() || config->readBoolEntry( "MMBOpensTab", false ) ) {
+    if ( args.newTab() || (config->readBoolEntry( "MMBOpensTab", false ) &&
+         const_cast<KParts::URLArgs*>(&args)->metaData()["forcenewwindow"]=="") ) {
       KonqOpenURLRequest req;
       req.newTab = true;


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