File fwupd_Port_deprecated_API.patch of Package discover
From 2ecf9cc474a3773a8def721e7e93f1592c7abda3 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Wed, 1 Nov 2023 02:07:17 +0100
Subject: [PATCH] fwupd: Port deprecated API
---
libdiscover/backends/FwupdBackend/FwupdBackend.cpp | 4 ++--
libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libdiscover/backends/FwupdBackend/FwupdBackend.cpp b/libdiscover/backends/FwupdBackend/FwupdBackend.cpp
index 5f3b1e71cc..7e0dfd2ad1 100644
--- a/libdiscover/backends/FwupdBackend/FwupdBackend.cpp
+++ b/libdiscover/backends/FwupdBackend/FwupdBackend.cpp
@@ -328,7 +328,7 @@ void FwupdBackend::setRemotes(GPtrArray *remotes)
{
for (uint i = 0; remotes && i < remotes->len; i++) {
FwupdRemote *remote = (FwupdRemote *)g_ptr_array_index(remotes, i);
- if (!fwupd_remote_get_enabled(remote))
+ if (!fwupd_remote_has_flag(remote, FWUPD_REMOTE_FLAG_ENABLED))
continue;
if (fwupd_remote_get_kind(remote) == FWUPD_REMOTE_KIND_LOCAL
@@ -336,7 +336,7 @@ void FwupdBackend::setRemotes(GPtrArray *remotes)
continue;
}
- fwupd_client_refresh_remote_async(client, remote, m_cancellable, fwupd_client_refresh_remote_cb, this);
+ fwupd_client_refresh_remote2_async(client, remote, FWUPD_CLIENT_DOWNLOAD_FLAG_NONE, m_cancellable, fwupd_client_refresh_remote_cb, this);
}
}
diff --git a/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp b/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp
index 0670c954e2..223c4d4ac5 100644
--- a/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp
+++ b/libdiscover/backends/FwupdBackend/FwupdSourcesBackend.cpp
@@ -34,7 +34,7 @@ public:
case Qt::CheckStateRole: {
if (value == Qt::Checked) {
m_backend->m_currentItem = item;
- if (fwupd_remote_get_approval_required(remote)) {
+ if (fwupd_remote_has_flag(remote, FWUPD_REMOTE_FLAG_APPROVAL_REQUIRED)) {
QString eulaText = i18n("The remote %1 require that you accept their license:\n %2",
QString::fromUtf8(fwupd_remote_get_title(remote)),
QString::fromUtf8(fwupd_remote_get_agreement(remote)));
@@ -88,7 +88,7 @@ void FwupdSourcesBackend::populateSources()
it->setData(id, AbstractSourcesBackend::IdRole);
it->setData(QVariant(QString::fromUtf8(fwupd_remote_get_title(remote))), Qt::ToolTipRole);
it->setCheckable(true);
- it->setCheckState(fwupd_remote_get_enabled(remote) ? Qt::Checked : Qt::Unchecked);
+ it->setCheckState(fwupd_remote_has_flag(remote, FWUPD_REMOTE_FLAG_ENABLED) ? Qt::Checked : Qt::Unchecked);
m_sources->appendRow(it);
}
}
@@ -121,7 +121,7 @@ void FwupdSourcesBackend::cancel()
{
FwupdRemote *remote =
fwupd_client_get_remote_by_id(backend->client, m_currentItem->data(AbstractSourcesBackend::IdRole).toString().toUtf8().constData(), nullptr, nullptr);
- m_currentItem->setCheckState(fwupd_remote_get_enabled(remote) ? Qt::Checked : Qt::Unchecked);
+ m_currentItem->setCheckState(fwupd_remote_has_flag(remote, FWUPD_REMOTE_FLAG_ENABLED) ? Qt::Checked : Qt::Unchecked);
m_currentItem = nullptr;
}
--
GitLab