[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=db7c837

The following commit has been merged in the master branch:
commit db7c8375ff3f45ab209c9410f1b053fe1a22a07e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jun 26 13:32:58 2011 +0100

    Remove unused code
---
 app/chat-window.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 0e6094a..517b694 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -105,10 +105,7 @@ void ChatWindow::startChat(const Tp::TextChannelPtr &incomingTextChannel, const
         // get chatWidget object
         ChatTab *auxChatTab = qobject_cast<ChatTab*>(m_tabWidget->widget(index));
 
-        // this should never happen
-        if (!auxChatTab) {
-            return;
-        }
+        Q_ASSERT(auxChatTab);
 
         // check for 1on1 duplicate chat
         if (auxChatTab->textChannel()->targetId() == incomingTextChannel->targetId()
@@ -122,12 +119,7 @@ void ChatWindow::startChat(const Tp::TextChannelPtr &incomingTextChannel, const
                 auxChatTab->setTextChannel(incomingTextChannel);    // replace with new one
                 auxChatTab->setChatEnabled(true);                   // re-enable chat
             }
-        } else if (auxChatTab->textChannel()->targetId() == incomingTextChannel->targetId()
-          && auxChatTab->textChannel()->targetHandleType() == Tp::HandleTypeContact) {
-            // got duplicate group chat. Wait for group handling to be sorted out
-            ///TODO sort this out once group chats are supported
-            kDebug() << "ChatWindow::startChat TODO need to implement when group chat is supported";
-        }
+        } 
     }
 
     // got new chat, create it

-- 
ktp-text-ui packaging