[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=3efa85d

The following commit has been merged in the master branch:
commit 3efa85d8c52bed569435e9505c7789804bdf8d47
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Sep 19 06:44:37 2013 +0000

    Query Nepomuk to try and start the telepathy nepomuk service
    
    REVIEW: 112809
---
 KTp/core.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/KTp/core.cpp b/KTp/core.cpp
index 42fbafd..91910bb 100644
--- a/KTp/core.cpp
+++ b/KTp/core.cpp
@@ -21,7 +21,8 @@
 #include "core.h"
 
 #ifdef HAVE_KPEOPLE
-#include <Nepomuk2/ResourceManager>
+#include <QDBusMessage>
+#include <QDBusReply>
 #endif
 
 #include <KGlobal>
@@ -38,7 +39,14 @@ CorePrivate::CorePrivate()
 {
     //if built with kpeople support, enable kpeople if Nepomuk is running
     #ifdef HAVE_KPEOPLE
-        m_kPeopleEnabled = Nepomuk2::ResourceManager::instance()->initialized();
+    QDBusInterface nepomukServer(QLatin1String("org.kde.NepomukServer"), QLatin1String("/servicemanager"), QLatin1String("org.kde.nepomuk.ServiceManager"));
+    QDBusReply<bool> reply = nepomukServer.call(QLatin1String("startService"), QLatin1String("nepomuktelepathyservice"));
+    if (reply.isValid()) {
+        if (reply.value()) {
+            m_kPeopleEnabled = true;
+        }
+    }
+    //else if it can't be started, or nepomukServer doesn't reply lave it disabled.
     #endif
 }
 

-- 
ktp-common-internals packaging