diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-27 14:17:06 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-10-08 13:31:48 +0200 |
| commit | 762866b8ec187ff1570bc6b6785cdafbb9480bbf (patch) | |
| tree | 20ebe52eef3136b2f35d5885b6f66aac65665150 /src | |
| parent | 4adea123aca2c22d7d9a6991782a6785aeb5378a (diff) | |
QNI:NetworkManager: Update dbus interface usage
We were using the non-standard interface for PropertiesChanged, and
support for this was dropped in a Network Manager update earlier this
year[0].
Switch to using the standard interface.
[0] https://networkmanager.dev/blog/networkmanager-1-32/
Change-Id: Ibdf2b635ae13a3150c4d2faa028c15c70c8af5ca
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
(cherry picked from commit 5d941c76604a534712f58ff9467f3c27083bf50c)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp | 15 | ||||
| -rw-r--r-- | src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp index 764507fd4b..1a5a798b10 100644 --- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp +++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp @@ -86,16 +86,16 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent) QDBusConnection::systemBus().connect( QLatin1String(NM_DBUS_SERVICE), QLatin1String(NM_DBUS_PATH), - QLatin1String(NM_DBUS_INTERFACE), QLatin1String("PropertiesChanged"), this, - SLOT(setProperties(QMap<QString, QVariant>))); + QLatin1String(DBUS_PROPERTIES_INTERFACE), QLatin1String("PropertiesChanged"), this, + SLOT(setProperties(QString, QMap<QString, QVariant>, QList<QString>))); } QNetworkManagerInterface::~QNetworkManagerInterface() { QDBusConnection::systemBus().disconnect( QLatin1String(NM_DBUS_SERVICE), QLatin1String(NM_DBUS_PATH), - QLatin1String(NM_DBUS_INTERFACE), QLatin1String("PropertiesChanged"), this, - SLOT(setProperties(QMap<QString, QVariant>))); + QLatin1String(DBUS_PROPERTIES_INTERFACE), QLatin1String("PropertiesChanged"), this, + SLOT(setProperties(QString, QMap<QString, QVariant>, QList<QString>))); } QNetworkManagerInterface::NMState QNetworkManagerInterface::state() const @@ -112,8 +112,13 @@ QNetworkManagerInterface::NMConnectivityState QNetworkManagerInterface::connecti return QNetworkManagerInterface::NM_CONNECTIVITY_UNKNOWN; } -void QNetworkManagerInterface::setProperties(const QMap<QString, QVariant> &map) +void QNetworkManagerInterface::setProperties(const QString &interfaceName, + const QMap<QString, QVariant> &map, + const QStringList &invalidatedProperties) { + Q_UNUSED(interfaceName); + Q_UNUSED(invalidatedProperties); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) { const bool isState = i.key() == QLatin1String("State"); const bool isConnectivity = i.key() == QLatin1String("Connectivity"); diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h index 57c5aed763..4b24397b3b 100644 --- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h +++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h @@ -131,7 +131,8 @@ Q_SIGNALS: void connectivityChanged(NMConnectivityState); private Q_SLOTS: - void setProperties(const QMap<QString, QVariant> &map); + void setProperties(const QString &interfaceName, const QMap<QString, QVariant> &map, + const QStringList &invalidatedProperties); private: Q_DISABLE_COPY_MOVE(QNetworkManagerInterface) |