From 0f3d090bd1dc9a6b912eb0b1e587602573304b4a Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 17 Feb 2016 20:41:52 +0100
Subject: First attempt at QML hacking.

Main and ServiceControl adapted. Project files
---
 rockworkd/platformintegration/sailfish/callchannelobserver.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'rockworkd/platformintegration/sailfish/callchannelobserver.cpp')

diff --git a/rockworkd/platformintegration/sailfish/callchannelobserver.cpp b/rockworkd/platformintegration/sailfish/callchannelobserver.cpp
index 534c360..a9f41f3 100644
--- a/rockworkd/platformintegration/sailfish/callchannelobserver.cpp
+++ b/rockworkd/platformintegration/sailfish/callchannelobserver.cpp
@@ -15,9 +15,10 @@ TelepathyMonitor::TelepathyMonitor(QObject *parent):
     QObject(parent)
 {
     Tp::registerTypes();
-    QTimer::singleShot(0, this, SLOT(accountManagerSetup));
-    m_contactManager = new QContactManager("org.nemomobile.contacts.sqlite");
-    m_contactManager->setParent(this);
+    QTimer::singleShot(0, this, SLOT(accountManagerSetup()));
+    QMap<QString, QString> parameters;
+    parameters.insert(QString::fromLatin1("mergePresenceChanges"), QString::fromLatin1("false"));
+    m_contactManager = new QContactManager("", parameters, this);
 }
 
 void TelepathyMonitor::hangupCall(uint cookie)
@@ -42,7 +43,7 @@ void TelepathyMonitor::accountManagerReady(Tp::PendingOperation* operation)
 {
     if (operation->isError()) {
         qDebug() << "TelepathyMonitor: accountManager init error.";
-        QTimer::singleShot(1000, this, SLOT(TelepathyMonitor::accountManagerSetup)); // again
+        QTimer::singleShot(1000, this, SLOT(accountManagerSetup())); // again
         return;
     }
     qDebug() << "Telepathy account manager ready";
-- 
cgit v1.2.3