[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=139e227

The following commit has been merged in the master branch:
commit 139e22761c2511906435b0e8149354ff8750d6e1
Author: David Edmundson <davidedmundson at kde.org>
Date:   Wed Apr 2 13:03:33 2014 +0200

    Add small app for running the status handling of the kded
    
    Rather than restarting kded all the time developers can run the small
    test app to check the status handling.
    
    REVIEW: 117329
---
 status-handler.cpp                                 |  1 +
 telepathy-module.cpp                               |  1 +
 tests/CMakeLists.txt                               | 25 ++++++++++++++++++++--
 ...act-cache-main.cpp => status-handling-main.cpp} | 24 ++++++++++++++++-----
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/status-handler.cpp b/status-handler.cpp
index db7f977..4b9c25a 100644
--- a/status-handler.cpp
+++ b/status-handler.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright (C) 2014  David Edmundson <kde at davidedmundson.co.uk>
+    Copyright (C) 2011  Martin Klapetek <martin.klapetek at gmail.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 90471f9..ce3ffdc 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -1,6 +1,7 @@
 /*
     KDE integration module for Telepathy
     Copyright (C) 2011  Martin Klapetek <martin.klapetek at gmail.com>
+    Copyright (C) 2014  David Edmundson <kde at davidedmundson.co.uk>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7696369..7ec7749 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,11 +1,10 @@
+remove_definitions (-DQT_NO_CAST_FROM_ASCII)
 
 set(contactcache_test_SRCS
     ../contact-cache.cpp
     contact-cache-main.cpp
 )
 
-###
-
 kde4_add_executable(contact-cache
     ${contactcache_test_SRCS}
 )
@@ -16,3 +15,25 @@ target_link_libraries(contact-cache
   ${TELEPATHY_QT4_LIBRARIES}
   ${KTP_LIBRARIES}
 )
+
+set(status_test_SRCS
+    ../status-handler.cpp
+    ../telepathy-kded-module-plugin.cpp
+    ../telepathy-mpris.cpp
+    ../screensaveraway.cpp
+    ../autoaway.cpp
+    ../autoconnect.cpp
+    status-handling-main.cpp
+)
+
+kde4_add_executable(status-test
+    ${status_test_SRCS}
+)
+
+target_link_libraries(status-test
+  ${KDE4_KDECORE_LIBS}
+  ${TELEPATHY_QT4_LIBRARIES}
+  ${KTP_LIBRARIES}
+  ${KDE4_KIDLETIME_LIBRARY}
+)
+
diff --git a/tests/contact-cache-main.cpp b/tests/status-handling-main.cpp
similarity index 53%
copy from tests/contact-cache-main.cpp
copy to tests/status-handling-main.cpp
index 1ffa308..9fddb13 100644
--- a/tests/contact-cache-main.cpp
+++ b/tests/status-handling-main.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014  Alexandr Akulich <akulichalexander at gmail.com>
+    Copyright (C) 2014  David Edmundson <davidedmundson at kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -16,18 +16,32 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "contact-cache.h"
+#include "status-handler.h"
 
-#include <QCoreApplication>
+#include <QApplication>
+#include <QDBusMessage>
+#include <QDBusConnection>
+#include <QDBusReply>
 
 #include <TelepathyQt/Types>
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication app(argc, argv);
+    //QApplication is needed above QCoreApplication for KIdleTime
+    QApplication app(argc, argv);
     Tp::registerTypes();
 
-    ContactCache cache(&app);
+    QDBusInterface kdedInterface("org.kde.kded","/kded","org.kde.kded");
+    QDBusReply<QStringList> reply =  kdedInterface.call("loadedModules");
+
+    if (reply.value().contains("kded_ktp_integration_module")) {
+        qDebug() << "The KTp KDED module is already running.";
+        qDebug() << "To unload it run:";
+        qDebug() << "qdbus org.kde.kded /kded org.kde.kded.unloadModule kded_ktp_integration_module";
+        app.exit();
+    }
+
+    StatusHandler statusHandler(&app);
 
     return app.exec();
 }

-- 
ktp-kded-integration-module packaging