[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=d743194

The following commit has been merged in the master branch:
commit d74319468dbd116586bcf56a278f2f7b0b333ec3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Sep 26 01:29:21 2013 +0000

    Check nepomuk storage is running as well as the ktp-feeder
    
    REVIEW: 112948
---
 KTp/core.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/KTp/core.cpp b/KTp/core.cpp
index 91910bb..a0458f9 100644
--- a/KTp/core.cpp
+++ b/KTp/core.cpp
@@ -21,6 +21,7 @@
 #include "core.h"
 
 #ifdef HAVE_KPEOPLE
+#include <Nepomuk2/ResourceManager>
 #include <QDBusMessage>
 #include <QDBusReply>
 #endif
@@ -39,11 +40,13 @@ CorePrivate::CorePrivate()
 {
     //if built with kpeople support, enable kpeople if Nepomuk is running
     #ifdef HAVE_KPEOPLE
-    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;
+    if (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.

-- 
ktp-common-internals packaging