From c71556e4336f7c3871580dd709ae88aa4fa0b255 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Mon, 29 May 2017 10:09:28 +0200
Subject: [PATCH] contacts: adapt for new daemon API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[JN : add missing paramter]
Change-Id: Id76c75511e5601d5147858fc84caa39201d8f538
Reviewed-by: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>
---
src/contactrequest.cpp | 2 +-
src/qtwrapper/configurationmanager_wrap.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/contactrequest.cpp b/src/contactrequest.cpp
index 448b05ad..d1e0e093 100644
--- a/src/contactrequest.cpp
+++ b/src/contactrequest.cpp
@@ -111,7 +111,7 @@ bool ContactRequest::discard()
void
ContactRequest::block()
{
- ConfigurationManager::instance().removeContact(d_ptr->m_pAccount->id(), d_ptr->m_pCertificate->remoteId());
+ ConfigurationManager::instance().removeContact(d_ptr->m_pAccount->id(), d_ptr->m_pCertificate->remoteId(), true);
emit requestBlocked();
}
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index 07ba9c82..35f330ef 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -647,9 +647,9 @@ public Q_SLOTS: // METHODS
DRing::sendTrustRequest(accountId.toStdString(), from.toStdString(), raw);
}
- void removeContact(const QString &accountId, const QString &uri)
+ void removeContact(const QString &accountId, const QString &uri, bool ban)
{
- DRing::removeContact(accountId.toStdString(), uri.toStdString());
+ DRing::removeContact(accountId.toStdString(), uri.toStdString(), ban);
}
uint64_t sendTextMessage(const QString& accountId, const QString& to, const QMap<QString,QString>& payloads)
--
GitLab