[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=927d3dd

The following commit has been merged in the master branch:
commit 927d3dd5c5c4ac1ef68ef71ac63383be49991add
Author: Lasath Fernando <kde at lasath.org>
Date:   Wed Jul 6 18:39:58 2011 +0530

    Make handleChannels create a new window if none exist.
---
 app/telepathy-chat-ui.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index 8369338..71ac4ee 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -46,7 +46,6 @@ TelepathyChatUi::TelepathyChatUi()
         openMode = NewWindow;
     } else if (mode == "FirstWindow"){
         openMode = FirstWindow;
-        createWindow();
     } else if (mode == "LastWindow"){
         openMode = LastWindow;
     }
@@ -128,7 +127,7 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
         ChatWindow* window = NULL;
         switch (openMode) {
             case FirstWindow:
-                window = m_chatWindows[0];
+                window = m_chatWindows.count()?m_chatWindows[0]:createWindow();
                 break;
             case LastWindow:
             case NewWindow:

-- 
ktp-text-ui packaging