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

List:       kde-commits
Subject:    kdebase/konqueror
From:       Daniel Teske <teske () squorn ! de>
Date:       2005-01-24 18:43:29
Message-ID: 20050124184329.70C421D22D () office ! kde ! org
[Download RAW message or body]

CVS commit by teske: 

Bug 96539: detached tab should bring history of the initial tab
Also ensure that m_pDocContainer of the new window's view manager
is correctly set.


  M +7 -4      konq_viewmgr.cc   1.278


--- kdebase/konqueror/konq_viewmgr.cc  #1.277:1.278
@@ -497,4 +497,5 @@ void KonqViewManager::breakOffTab( KonqF
   config.writeEntry( "RootItem", prefix );
   prefix.append( '_' );
+  config.writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true );
   currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
 
@@ -504,8 +505,10 @@ void KonqViewManager::breakOffTab( KonqF
   mainWindow->viewManager()->loadViewProfile( config, "" );
 
-  mainWindow->viewManager()->setDocContainer( mainWindow->childFrame() );
-
-  if (mainWindow->currentView())
-    mainWindow->copyHistory( currentFrame );
+  if( mainWindow->childFrame() &&  mainWindow->childFrame()->frameType() == "Tabs")
+  {
+    KonqFrameTabs *kft = dynamic_cast<KonqFrameTabs *>(mainWindow->childFrame());
+    if(kft->childFrameList()->count())
+      kft->childFrameList()->at(0)->copyHistory( currentFrame );
+  }
 
   removeTab( currentFrame );


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