[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=70d32d1

The following commit has been merged in the master branch:
commit 70d32d11665a132429d122ba22a500d01c38112c
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Wed Apr 20 12:52:12 2011 +0300

    Enable all the channel class specs that we are going to support in the first release.
---
 src/approverdaemon.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/approverdaemon.cpp b/src/approverdaemon.cpp
index 13bcfb2..4b61aa9 100644
--- a/src/approverdaemon.cpp
+++ b/src/approverdaemon.cpp
@@ -24,14 +24,9 @@ static inline Tp::ChannelClassSpecList channelClassSpecList()
 {
     return Tp::ChannelClassSpecList()
                 << Tp::ChannelClassSpec::textChat()
-#if 0
                 << Tp::ChannelClassSpec::unnamedTextChat()
                 << Tp::ChannelClassSpec::textChatroom()
-                << Tp::ChannelClassSpec::streamedMediaCall()
-                << Tp::ChannelClassSpec::streamedMediaAudioCall()
-                << Tp::ChannelClassSpec::streamedMediaVideoCall()
                 << Tp::ChannelClassSpec::incomingFileTransfer()
-#endif
                 ;
 }
 

-- 
ktp-approver packaging