[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=86a5fa4

The following commit has been merged in the master branch:
commit 86a5fa47d1de72dfea3919faa141188779ffc0eb
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Mar 8 14:10:18 2011 +0100

    Add TP_DEBUG cmake option to enable Tp-Qt4 debug output
---
 CMakeLists.txt | 4 ++++
 main.cpp       | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e790699..b746a2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,10 @@ set (CMAKE_MODULE_PATH
      ${CMAKE_MODULE_PATH}
 )
 
+OPTION(TP_DEBUG  "Enable Telepathy-Qt4 Debug output" OFF )
+
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h )
+
 set(KDE_MIN_VERSION "4.4.75")
 find_package (KDE4 4.4.75 REQUIRED)
 find_package (TelepathyQt4 REQUIRED)
diff --git a/main.cpp b/main.cpp
index 8793c2c..cc87a4f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,6 +25,7 @@ extern "C"
 }
 
 #include "main-widget.h"
+#include "config.h"
 
 #include <KAboutData>
 #include <KCmdLineArgs>
@@ -61,7 +62,9 @@ int main(int argc, char *argv[])
     KApplication app;
     
     Tp::registerTypes();
-//     Tp::enableDebug(true);
+#ifdef TP_DEBUG
+    Tp::enableDebug(true);
+#endif
     Tp::enableWarnings(true);
 
 //     Nepomuk::ResourceManager::instance()->init();

-- 
ktp-contact-list packaging