[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=314b15f

The following commit has been merged in the master branch:
commit 314b15f497634c4719f77dc58b86907cdb277987
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jul 16 17:47:28 2012 +0100

    If we're invited to a group chat, join it.
---
 app/telepathy-chat-ui.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index f3d6bdf..d7717f8 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -148,6 +148,13 @@ 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())) {
+        textChannel->groupAddContacts(QList<Tp::ContactPtr>() << textChannel->groupSelfContact());
+    }
+
+
+
     //if there is currently no tab containing the incoming channel.
     if (!tabFound) {
         ChatWindow* window = 0;

-- 
ktp-text-ui packaging