From kde-commits  Tue May 19 02:13:31 2009
From: Eike Hein <hein () kde ! org>
Date: Tue, 19 May 2009 02:13:31 +0000
To: kde-commits
Subject: extragear/utils/yakuake
Message-Id: <1242699211.010336.13285.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=124269921932013

SVN commit 969817 by hein:

Fix interactive rename of sessions not working reliably - either failing
to implement a rename or renaming the wrong session - once tabs have been
moved or sessions closed, due to a mixup of tab indices and session IDs
in the rename code.
CCMAIL:spatz@psybear.com


 M  +7 -0      ChangeLog  
 M  +2 -2      app/tabbar.cpp  


--- trunk/extragear/utils/yakuake/ChangeLog #969816:969817
@@ -1,3 +1,10 @@
+Changes since 2.9.5:
+* Fixed interactive rename of sessions not working reliably - either failing
+  to implement a rename or renaming the wrong session - once tabs had been
+  moved or sessions closed, due to a mixup of tab indices and session IDs in
+  the rename code.
+
+
 Changes in 2.9.5:
 * Added a new framework, referred to as the visual event overlay, to display
   notifications (and potentially other information) on top of the terminals.
--- trunk/extragear/utils/yakuake/app/tabbar.cpp #969816:969817
@@ -619,13 +619,13 @@
     if (sessionId == -1) return;
     if (!m_tabs.contains(sessionId)) return;
 
+    m_renamingSessionId = sessionId;
+
     int index = m_tabs.indexOf(sessionId);
     int x = index ? m_tabWidths.at(index - 1) : m_skin->tabBarPosition().x();
     int y = m_skin->tabBarPosition().y();
     int width = m_tabWidths.at(index) - x;
 
-    m_renamingSessionId = index;
-
     m_lineEdit->setText(m_tabTitles[sessionId]);
     m_lineEdit->setGeometry(x-1, y-1, width+3, height()+2);
     m_lineEdit->selectAll();