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

List:       kde-commits
Subject:    extragear/utils/yakuake
From:       Eike Hein <hein () kde ! org>
Date:       2009-03-27 16:16:08
Message-ID: 1238170568.481374.16160.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 945530 by hein:

Fix the 'removeTerminal(int terminalId)' D-Bus call always closing the
active terminal of the session containing the target terminal, rather
than the target terminal.


 M  +3 -0      ChangeLog  
 M  +2 -4      app/session.cpp  


--- trunk/extragear/utils/yakuake/ChangeLog #945529:945530
@@ -20,6 +20,9 @@
   multi-key global shortcuts are not allowed in KDE is that they don't work.
 * Added D-Bus interfaces for splitting.
 * Fix crashes when closing sessions with certain split setups (also on quit).
+* Fixed the 'removeTerminal(int terminalId)' D-Bus call always closing the
+  active terminal of the session containing the target terminal, rather than
+  the target terminal.
 
 
 Changes in 2.9.4:
--- trunk/extragear/utils/yakuake/app/session.cpp #945529:945530
@@ -159,11 +159,9 @@
 {
     if (terminalId == -1) terminalId = m_activeTerminalId;
     if (terminalId == -1) return;
-    if (!m_terminals.contains(terminalId)) return;    
+    if (!m_terminals.contains(terminalId)) return;
 
-    Terminal* activeTerminal = m_terminals[m_activeTerminalId];
-
-    if (activeTerminal) activeTerminal->deletePart();
+    m_terminals[terminalId]->deletePart();
 }
 
 void Session::focusPreviousTerminal()
[prev in list] [next in list] [prev in thread] [next in thread]