[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=56c0050

The following commit has been merged in the master branch:
commit 56c00501e303f28410a3b040d59e31b5d92d0f0e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 9 14:37:00 2015 +0100

    [Declarative] Start contact list by activating dbus service
    
    KToolInvocation::startServiceByDesktopName is deprecated and for some reason does not work with org.kde.ktpcontactlist anyway.
    
    Also fixes the coding style.
---
 KTp/Declarative/telepathy-manager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/KTp/Declarative/telepathy-manager.cpp b/KTp/Declarative/telepathy-manager.cpp
index d3b7427..a5e8f14 100644
--- a/KTp/Declarative/telepathy-manager.cpp
+++ b/KTp/Declarative/telepathy-manager.cpp
@@ -204,15 +204,17 @@ void TelepathyManager::toggleContactList()
                                                              QLatin1String("toggleWindowVisibility"));
 
     QDBusPendingCall call = QDBusConnection::sessionBus().asyncCall(methodCall);
-    QDBusPendingCallWatcher* watch = new QDBusPendingCallWatcher(call, this);
+    QDBusPendingCallWatcher *watch = new QDBusPendingCallWatcher(call, this);
     connect(watch, SIGNAL(finished(QDBusPendingCallWatcher*)), SLOT(contactlistDBusAccessed(QDBusPendingCallWatcher*)));
     connect(watch, SIGNAL(finished(QDBusPendingCallWatcher*)), watch, SLOT(deleteLater()));
 }
 
-void TelepathyManager::contactlistDBusAccessed(QDBusPendingCallWatcher* w)
+void TelepathyManager::contactlistDBusAccessed(QDBusPendingCallWatcher *w)
 {
-    if(w->isError())
-        KToolInvocation::startServiceByDesktopName(QLatin1String("ktp-contactlist"));
+    if (w->isError()) {
+        // if toggleWindowVisibility failed, try starting the application via dbus
+        QDBusConnection::sessionBus().interface()->startService(QStringLiteral("org.kde.ktpcontactlist"));
+    }
 }
 
 void TelepathyManager::showSettingsKCM()

-- 
ktp-common-internals packaging