CVS commit by binner: 

Take out 89103 patch again as people see it as bug/regression (98623, 99172)
CCBUG: 89103, 98623


  M +10 -21    konq_mainwindow.cc   1.1406.2.1
  M +0 -1      konq_mainwindow.h   1.458.2.1


--- kdebase/konqueror/konq_mainwindow.cc  #1.1406:1.1406.2.1
@@ -513,8 +513,11 @@ void KonqMainWindow::openURL( KonqView *
     view = m_currentView; /* Note, this can be 0L, e.g. on startup */
   else if ( !view && req.newTab ) {
+    KConfig *config = KGlobal::config();
+    KConfigGroupSaver cs( config, QString::fromLatin1("FMSettings") );
+    bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
     view = m_pViewManager->addTab(QString::null,
                                   QString::null,
                                   false,
-                                  req.openAfterCurrentPage);
+                                  openAfterCurrentPage);
     if (view) {
       view->setCaption( _url.host() );
@@ -960,8 +963,4 @@ void KonqMainWindow::openURL( KonqView *
     childView->stop();
     req.forceAutoEmbed = true;
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs( config, QString::fromLatin1("FMSettings") );
-
-    req.openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false ) ;
     openView( serviceType, url, childView, req );
     return;
@@ -1078,5 +1077,4 @@ void KonqMainWindow::slotCreateNewWindow
       req.newTabInFront = config->readBoolEntry( "NewTabsInFront", false );
 
-      req.openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
       if (KApplication::keyboardMouseState() & Qt::ShiftButton)
         req.newTabInFront = !req.newTabInFront;
@@ -2506,8 +2504,11 @@ void KonqMainWindow::slotSplitViewVertic
 void KonqMainWindow::slotAddTab()
 {
+  KConfig *config = KGlobal::config();
+  KConfigGroupSaver cs( config, QString::fromLatin1("FMSettings") );
+  bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
   KonqView* newView = m_pViewManager->addTab(QString::null,
                                              QString::null,
                                              false,
-                                             false);
+                                             openAfterCurrentPage);
   if (newView == 0L) return;
   openURL( newView, KURL("about:blank"),QString::null);
@@ -2608,16 +2609,4 @@ void KonqMainWindow::slotPopupNewTab()
 }
 
-void KonqMainWindow::slotPopupNewTabRight()
-{
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs( config, QString::fromLatin1("FMSettings") );
-    bool newTabsInFront = config->readBoolEntry( "NewTabsInFront", false );
-
-    if (KApplication::keyboardMouseState() & ShiftButton)
-      newTabsInFront = !newTabsInFront;
-
-    popupNewTab(newTabsInFront, false);
-}
-
 void KonqMainWindow::popupNewTab(bool infront, bool openAfterCurrentPage)
 {
@@ -3945,5 +3934,5 @@ void KonqMainWindow::slotFillContextMenu
     for (; it != list.end(); ++it )
       popupItems.append( new KFileItem( (*it), QString::null, KFileItem::Unknown) );
-    pm->insertItem( SmallIcon("tab_new"), i18n( "Open Folder in Tabs" ), this, SLOT( slotPopupNewTabRight() ) );
+    pm->insertItem( SmallIcon("tab_new"), i18n( "Open Folder in Tabs" ), this, SLOT( slotPopupNewTab() ) );
   }
   else
@@ -3951,5 +3940,5 @@ void KonqMainWindow::slotFillContextMenu
     popupItems.append( new KFileItem( bk.url(), QString::null, KFileItem::Unknown) );
     pm->insertItem( SmallIcon("window_new"), i18n( "Open in New Window" ), this, SLOT( slotPopupNewWindow() ) );
-    pm->insertItem( SmallIcon("tab_new"), i18n( "Open in New Tab" ), this, SLOT( slotPopupNewTabRight() ) );
+    pm->insertItem( SmallIcon("tab_new"), i18n( "Open in New Tab" ), this, SLOT( slotPopupNewTab() ) );
   }
 }

--- kdebase/konqueror/konq_mainwindow.h  #1.458:1.458.2.1
@@ -436,5 +436,4 @@ protected slots:
   void slotPopupThisWindow();
   void slotPopupNewTab();
-  void slotPopupNewTabRight();
   void slotPopupPasteTo();
   void slotRemoveView();