[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=6aa1988

The following commit has been merged in the master branch:
commit 6aa198896d7bd620e1d5969353aed31723f6149b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jul 16 18:14:54 2012 +0100

    Allow invite whilst in a group chat
---
 app/chat-window.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 785820c..376a6f5 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -312,7 +312,6 @@ void ChatWindow::onCurrentIndexChanged(int index)
         setFileTransferEnabled(selfCapabilities.fileTransfers() && contactCapabilites.fileTransfers());
         setVideoCallEnabled(selfCapabilities.streamedMediaVideoCalls() && contactCapabilites.streamedMediaVideoCalls());
         setShareDesktopEnabled(s_krfbAvailableChecker->isAvailable() && contactCapabilites.streamTubes(QLatin1String("rfb")));
-        /// TODO re-activate check when invitation to chat has been sorted out
         setInviteToChatEnabled(true);
 
         toggleBlockButton(currentChatTab->textChannel()->targetContact()->isBlocked());
@@ -322,8 +321,7 @@ void ChatWindow::onCurrentIndexChanged(int index)
         setFileTransferEnabled(false);
         setVideoCallEnabled(false);
         setShareDesktopEnabled(false);
-        /// TODO re-activate check when invitation to chat has been sorted out
-        setInviteToChatEnabled(false);
+        setInviteToChatEnabled(true);
         setBlockEnabled(false);
 
     }

-- 
ktp-text-ui packaging