[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=cb8d8d9

The following commit has been merged in the master branch:
commit cb8d8d92c6e92c2e9f03d4fbda81167a2cba3677
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Oct 7 16:12:32 2011 +0100

    Enable TpQt4 debug output redirection in KDebug
---
 src/telepathy-handler-application.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/telepathy-handler-application.cpp b/src/telepathy-handler-application.cpp
index ecbd18c..3cd0bd8 100644
--- a/src/telepathy-handler-application.cpp
+++ b/src/telepathy-handler-application.cpp
@@ -35,7 +35,6 @@ namespace KTelepathy {
 namespace {
 int s_tpqt4DebugArea;
 
-#if (0) //TODO check tp version
 static void tpDebugCallback(const QString &libraryName,
                             const QString &libraryVersion,
                             QtMsgType type,
@@ -45,7 +44,6 @@ static void tpDebugCallback(const QString &libraryName,
     Q_UNUSED(libraryVersion)
     kDebugStream(type, s_tpqt4DebugArea, __FILE__, __LINE__, "Telepathy-Qt4") << qPrintable(msg);
 }
-#endif
 }
 
 class TelepathyHandlerApplication::Private
@@ -132,10 +130,8 @@ void TelepathyHandlerApplication::Private::init(int initialTimeout, int timeout)
     // Register TpQt4 types
     Tp::registerTypes();
 
-#if (0) // TODO check tp version
     // Redirect Tp debug and warnings to KDebug output
     Tp::setDebugCallback(&tpDebugCallback);
-#endif
 
     // Enable telepathy-Qt4 debug
     Tp::enableDebug(s_debug);

-- 
ktp-filetransfer-handler packaging