[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=72c8ff8

The following commit has been merged in the master branch:
commit 72c8ff85bbfe295017994777e1eeeb851f055b55
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Fri Mar 11 16:45:02 2011 +0100

    Add --debug command line option.
---
 CMakeLists.txt |  4 ----
 config.h.cmake |  6 ------
 main.cpp       | 11 +++++++----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2c4994..6bbb090 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,10 +5,6 @@ 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}/build/config.h )
-
 set(KDE_MIN_VERSION "4.4.75")
 find_package (KDE4 4.4.75 REQUIRED)
 find_package (TelepathyQt4 REQUIRED)
diff --git a/config.h.cmake b/config.h.cmake
deleted file mode 100644
index d5ced96..0000000
--- a/config.h.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#cmakedefine TP_DEBUG
-
-#endif // CONFIG_H
diff --git a/main.cpp b/main.cpp
index 9a2445e..8b951f7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,7 +25,6 @@ extern "C"
 }
 
 #include "main-widget.h"
-#include "build/config.h"
 
 #include <KAboutData>
 #include <KCmdLineArgs>
@@ -59,12 +58,16 @@ int main(int argc, char *argv[])
                         "martin.klapetek at gmail.com");
 
     KCmdLineArgs::init(argc, argv, &aboutData);
+
+    // Add --debug as commandline option
+    KCmdLineOptions options;
+    options.add("debug", ki18n("Show telepathy debbuging information"));
+    KCmdLineArgs::addCmdLineOptions(options);
+
     KApplication app;
 
     Tp::registerTypes();
-#ifdef TP_DEBUG
-    Tp::enableDebug(true);
-#endif
+    Tp::enableDebug(KCmdLineArgs::parsedArgs()->isSet("debug"));
     Tp::enableWarnings(true);
 
     // Set up signal handlers.

-- 
ktp-contact-list packaging