[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=68ffd6e

The following commit has been merged in the master branch:
commit 68ffd6e4ec2525287a3a00ddbabefcac0be3ce9f
Author: Ahmed Ibrahim <ahmedibrahimkhali at gmail.com>
Date:   Wed Apr 23 22:34:58 2014 +0200

    Text-UI breaks "Per window" keyboard layout switching
    
    This bug happens when the user has switched the keyboard layout of a chat tab and then switched to another application with another language, And he received a message or an "is typing" chat status, the language is then changed to the language of the Chat Tab that he was previously in, which is of course is an annoying behavior.
    
    The reason of this behavior is that the restoreKeyboardLayout method is called inside the onCurrentIndexChanged without making sure that the Chat Window is active.
    
    REVIEW: 117729
    BUG: 333742
---
 app/chat-window.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index a7da574..67059c8 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -347,7 +347,9 @@ void ChatWindow::onCurrentIndexChanged(int index)
     kDebug() << "Current spell dictionary is" << currentChatTab->spellDictionary();
     m_spellDictCombo->setCurrentByDictionary(currentChatTab->spellDictionary());
 
-    restoreKeyboardLayout(currentChatTab);
+    if (currentChatTab->isActiveWindow()) {
+	restoreKeyboardLayout(currentChatTab);
+    }
 
     // when the tab changes I need to "refresh" the window's findNext and findPrev actions
     if (currentChatTab->chatSearchBar()->searchBar()->text().isEmpty()) {

-- 
ktp-text-ui packaging