------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
        
http://bugs.kde.org/show_bug.cgi?id=90017        
pletourn globetrotter net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From pletourn globetrotter net  2004-09-30 17:14 -------
CVS commit by pletourn: 

Move the special case 'linkableViewsCount() == 2' to KonqMainWindow
CCMAIL:90017-done bugs kde org


  M +3 -14     konq_frame.cc   1.194.2.1
  M +16 -2     konq_mainwindow.cc   1.1342.2.11


--- kdebase/konqueror/konq_frame.cc  #1.194:1.194.2.1
 @ -446,18 +446,7  @ void KonqFrame::slotStatusBarClicked()
 void KonqFrame::slotLinkedViewClicked( bool mode )
 {
-  if (m_pView->mainWindow()->linkableViewsCount() == 2)
-  {
-    // Exactly two linkable views : link both
-    KonqMainWindow::MapViews mapViews = m_pView->mainWindow()->viewMap();
-    KonqMainWindow::MapViews::Iterator it = mapViews.begin();
-    if( (*it)->isFollowActive() ) // skip sidebar
-        ++it;
-    (*it)->setLinkedView( mode );
-    ++it;
-    if( (*it)->isFollowActive() ) // skip sidebar
-        ++it;
-    (*it)->setLinkedView( mode );
-  }
-  else // Normal case : just this view
+  if ( m_pView->mainWindow()->linkableViewsCount() == 2 )
+    m_pView->mainWindow()->slotLinkView();
+  else
     m_pView->setLinkedView( mode );
 }

--- kdebase/konqueror/konq_mainwindow.cc  #1.1342.2.10:1.1342.2.11
 @ -1699,6 +1699,20  @ void KonqMainWindow::slotLinkView()
   // Can't access this action in passive mode anyway
   assert(!m_currentView->isPassiveMode());
-  bool link = !m_currentView->isLinkedView();
-  m_currentView->setLinkedView( link ); // takes care of the statusbar and the action
+  bool mode = !m_currentView->isLinkedView();
+
+  if (linkableViewsCount() == 2)
+  {
+    // Exactly two linkable views : link both
+    KonqMainWindow::MapViews::ConstIterator it = viewMap().begin();
+    if( (*it)->isFollowActive() ) // skip sidebar
+        ++it;
+    (*it)->setLinkedView( mode );
+    ++it;
+    if( (*it)->isFollowActive() ) // skip sidebar
+        ++it;
+    (*it)->setLinkedView( mode );
+  }
+  else // Normal case : just this view
+    m_currentView->setLinkedView( mode );
 }
_______________________________________________
Konq-bugs mailing list
Konq-bugs@mail.kde.org
https://mail.kde.org/mailman/listinfo/konq-bugs