[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=8a767f7

The following commit has been merged in the master branch:
commit 8a767f7e71ba52dd5614cc404a067e39bab9ec99
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Nov 15 23:29:15 2013 +0100

    Let's always enable kpeople mode if HAVE_KPEOPLE is defined
---
 KTp/core.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/KTp/core.cpp b/KTp/core.cpp
index 878987d..6e2a201 100644
--- a/KTp/core.cpp
+++ b/KTp/core.cpp
@@ -47,16 +47,7 @@ CorePrivate::CorePrivate()
 {
     //if built with kpeople support, enable kpeople if Nepomuk is running
     #ifdef HAVE_KPEOPLE
-    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 leave it disabled.
+    m_kPeopleEnabled = true;
     #endif
 
     Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),

-- 
ktp-common-internals packaging