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

The following commit has been merged in the master branch:
commit cabad3ed7c236e03e81e75019b38390319e7ca4f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Aug 3 15:32:58 2012 +0100

    Correctly join group chats when selfContact is invited.
---
 app/telepathy-chat-ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index 6e097c4..e9a35e5 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -149,7 +149,7 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
     }
 
     //if it's a group chat, we've been invited to. Join it
-    if (textChannel->isConference() && ! textChannel->groupLocalPendingContacts().contains(textChannel->groupSelfContact())) {
+    if (textChannel->groupLocalPendingContacts().contains(textChannel->groupSelfContact())) {
         textChannel->groupAddContacts(QList<Tp::ContactPtr>() << textChannel->groupSelfContact());
     }
 

-- 
ktp-text-ui packaging