[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=9e50816

The following commit has been merged in the master branch:
commit 9e50816fba0de0c6e07d6cab9d07546dd9779820
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Aug 30 12:34:25 2013 +0100

    When in "one chat per window" mode, make sure to re-use the initially created window
    
    REVIEW: 112376
---
 app/telepathy-chat-ui.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index 2593089..b0cf7fc 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -153,7 +153,13 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
                 window = m_chatWindows.count()?m_chatWindows[0]:createWindow();
                 break;
             case TextChatConfig::NewWindow:
-                window = createWindow();
+                //as we now create a window on load, if we are in one window per chat mode
+                //we need to check if the first made window is empty
+                if (m_chatWindows.count() == 1 && ! m_chatWindows[0]->getCurrentTab()) {
+                    window = m_chatWindows[0];
+                } else {
+                    window = createWindow();
+                }
                 break;
         }
 

-- 
ktp-text-ui packaging