summaryrefslogtreecommitdiff
path: root/rockworkd/platformintegration/sailfish/callchannelobserver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rockworkd/platformintegration/sailfish/callchannelobserver.cpp')
-rw-r--r--rockworkd/platformintegration/sailfish/callchannelobserver.cpp9
1 files changed, 5 insertions, 4 deletions
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";