Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2022-04-11 23:47:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Mon Apr 11 23:47:47 2022 rev:101 rq:968202 version:5.93.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2022-03-14 19:36:27.730082917 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.1900/libKF5NetworkManagerQt.changes
2022-04-11 23:49:13.799079756 +0200
@@ -1,0 +2,13 @@
+Sun Apr 3 10:47:31 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.93.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.93.0
+- Changes since 5.92.0:
+ * Require unittests to pass for CI jobs to pass
+ * Connect in the correct order everywhere
+ * Remove workaround for properties changing
+ * Do not create devices to just find out the type
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.92.0.tar.xz
networkmanager-qt-5.92.0.tar.xz.sig
New:
----
networkmanager-qt-5.93.0.tar.xz
networkmanager-qt-5.93.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.zEIzQC/_old 2022-04-11 23:49:14.979066293 +0200
+++ /var/tmp/diff_new_pack.zEIzQC/_new 2022-04-11 23:49:14.983066248 +0200
@@ -17,7 +17,7 @@
%define soversion 6
-%define _tar_path 5.92
+%define _tar_path 5.93
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: libKF5NetworkManagerQt
-Version: 5.92.0
+Version: 5.93.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ networkmanager-qt-5.92.0.tar.xz -> networkmanager-qt-5.93.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/.kde-ci.yml
new/networkmanager-qt-5.93.0/.kde-ci.yml
--- old/networkmanager-qt-5.92.0/.kde-ci.yml 2022-03-05 12:20:06.000000000
+0100
+++ new/networkmanager-qt-5.93.0/.kde-ci.yml 2022-04-02 12:05:11.000000000
+0200
@@ -5,3 +5,4 @@
Options:
test-before-installing: True
+ require-passing-tests-on: [ 'Linux' ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/CMakeLists.txt
new/networkmanager-qt-5.93.0/CMakeLists.txt
--- old/networkmanager-qt-5.92.0/CMakeLists.txt 2022-03-05 12:20:06.000000000
+0100
+++ new/networkmanager-qt-5.93.0/CMakeLists.txt 2022-04-02 12:05:11.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "5.92.0") # handled by release scripts
+set(KF_VERSION "5.93.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 5.92.0 NO_MODULE)
+find_package(ECM 5.93.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/accesspoint.cpp
new/networkmanager-qt-5.93.0/src/accesspoint.cpp
--- old/networkmanager-qt-5.92.0/src/accesspoint.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/accesspoint.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -52,18 +52,18 @@
{
Q_D(AccessPoint);
- // Get all AccessPoint's properties at once
- QVariantMap initialProperties =
NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(),
path);
- if (!initialProperties.isEmpty()) {
- d->propertiesChanged(initialProperties);
- }
-
QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
d->uni,
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
QLatin1String("PropertiesChanged"),
d,
SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
+
+ // Get all AccessPoint's properties at once
+ QVariantMap initialProperties =
NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(),
path);
+ if (!initialProperties.isEmpty()) {
+ d->propertiesChanged(initialProperties);
+ }
}
NetworkManager::AccessPoint::~AccessPoint()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/activeconnection.cpp
new/networkmanager-qt-5.93.0/src/activeconnection.cpp
--- old/networkmanager-qt-5.92.0/src/activeconnection.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/activeconnection.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -51,12 +51,6 @@
{
Q_D(ActiveConnection);
- // Get all ActiveConnection's at once
- QVariantMap initialProperties =
NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(),
path);
- if (!initialProperties.isEmpty()) {
- d->propertiesChanged(initialProperties);
- }
-
#ifndef NMQT_STATIC
QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
d->path,
@@ -77,13 +71,11 @@
connect(&d->iface,
&OrgFreedesktopNetworkManagerConnectionActiveInterface::StateChanged, d,
&ActiveConnectionPrivate::stateChanged);
#endif
-#ifndef NMQT_STATIC
- /*
- * Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
- * BUG:352326
- */
- d->recheckProperties();
-#endif
+ // Get all ActiveConnection's at once
+ QVariantMap initialProperties =
NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(),
path);
+ if (!initialProperties.isEmpty()) {
+ d->propertiesChanged(initialProperties);
+ }
}
NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate
&dd, QObject *parent)
@@ -111,14 +103,6 @@
connect(&d->iface,
&OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d,
&ActiveConnectionPrivate::propertiesChanged);
connect(&d->iface,
&OrgFreedesktopNetworkManagerConnectionActiveInterface::StateChanged, d,
&ActiveConnectionPrivate::stateChanged);
#endif
-
-#ifndef NMQT_STATIC
- /*
- * Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
- * BUG:352326
- */
- d->recheckProperties();
-#endif
}
NetworkManager::ActiveConnection::~ActiveConnection()
@@ -240,73 +224,6 @@
return d->devices;
}
-void NetworkManager::ActiveConnectionPrivate::recheckProperties()
-{
- Q_Q(ActiveConnection);
-
- /*
- * Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
- * BUG:352326
- */
- QStringList properties;
- const QDBusObjectPath ip4ConfigObjectPath = iface.ip4Config();
- const QDBusObjectPath ip6ConfigObjectPath = iface.ip6Config();
- const QDBusObjectPath dhcp4ConfigObjectPath = iface.dhcp4Config();
- const QDBusObjectPath dhcp6ConfigObjectPath = iface.dhcp6Config();
-
- if (state !=
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(iface.state()))
{
- properties << QLatin1String("State");
- }
-
- if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() !=
ipV4ConfigPath) {
- properties << QLatin1String("Ip4Config");
- }
-
- if (!ip6ConfigObjectPath.path().isNull() && ip6ConfigObjectPath.path() !=
ipV6ConfigPath) {
- properties << QLatin1String("Ip6Config");
- }
-
- if (!dhcp4ConfigObjectPath.path().isNull() && dhcp4ConfigObjectPath.path()
!= dhcp4ConfigPath) {
- properties << QLatin1String("Dhcp4Config");
- }
-
- if (!dhcp6ConfigObjectPath.path().isNull() && dhcp6ConfigObjectPath.path()
!= dhcp6ConfigPath) {
- properties << QLatin1String("Dhcp6Config");
- }
-
- for (const QString &property : std::as_const(properties)) {
- QDBusMessage message =
QDBusMessage::createMethodCall(NetworkManager::NetworkManagerPrivate::DBUS_SERVICE,
-
NetworkManager::NetworkManagerPrivate::DBUS_DAEMON_PATH,
-
NetworkManager::NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
-
QLatin1String("Get"));
- message << iface.staticInterfaceName() << property;
-
- QDBusPendingCall pendingCall =
QDBusConnection::systemBus().asyncCall(message);
- QDBusPendingCallWatcher *watcher = new
QDBusPendingCallWatcher(pendingCall, this);
-
- connect(watcher, &QDBusPendingCallWatcher::finished, [watcher, q,
this, property]() {
- watcher->deleteLater();
- if (property == QLatin1String("State")) {
- state =
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(iface.state());
- Q_EMIT q->stateChanged(state);
- }
- if (property == QLatin1String("Ip4Config")) {
- ipV4ConfigPath = iface.ip4Config().path();
- Q_EMIT q->ipV4ConfigChanged();
- } else if (property == QLatin1String("Ip6Config")) {
- ipV6ConfigPath = iface.ip6Config().path();
- Q_EMIT q->ipV6ConfigChanged();
- } else if (property == QLatin1String("Dhcp4Config")) {
- dhcp4ConfigPath = iface.dhcp4Config().path();
- Q_EMIT q->dhcp4ConfigChanged();
- } else if (property == QLatin1String("Dhcp6Config")) {
- dhcp6ConfigPath = iface.dhcp6Config().path();
- Q_EMIT q->dhcp6ConfigChanged();
- }
- });
- }
-}
-
void NetworkManager::ActiveConnectionPrivate::dbusPropertiesChanged(const
QString &interfaceName,
const
QVariantMap &properties,
const
QStringList &invalidatedProperties)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/activeconnection_p.h
new/networkmanager-qt-5.93.0/src/activeconnection_p.h
--- old/networkmanager-qt-5.92.0/src/activeconnection_p.h 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/activeconnection_p.h 2022-04-02
12:05:11.000000000 +0200
@@ -45,12 +45,6 @@
Q_DECLARE_PUBLIC(ActiveConnection)
ActiveConnection *q_ptr;
- /*
- * Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
- * BUG:352326
- */
- void recheckProperties();
-
public:
/**
* When subclassing make sure to call the parent class method
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/adsldevice.cpp
new/networkmanager-qt-5.93.0/src/adsldevice.cpp
--- old/networkmanager-qt-5.92.0/src/adsldevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/adsldevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -31,13 +31,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::AdslDevicePrivate::~AdslDevicePrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/bluetoothdevice.cpp
new/networkmanager-qt-5.93.0/src/bluetoothdevice.cpp
--- old/networkmanager-qt-5.92.0/src/bluetoothdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/bluetoothdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -31,12 +31,6 @@
d->propertiesChanged(initialProperties);
}
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::BluetoothDevice::~BluetoothDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/bonddevice.cpp
new/networkmanager-qt-5.93.0/src/bonddevice.cpp
--- old/networkmanager-qt-5.92.0/src/bonddevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/bonddevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -34,12 +34,6 @@
d->propertiesChanged(initialProperties);
}
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::BondDevicePrivate::~BondDevicePrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/bridgedevice.cpp
new/networkmanager-qt-5.93.0/src/bridgedevice.cpp
--- old/networkmanager-qt-5.92.0/src/bridgedevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/bridgedevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -31,13 +31,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::BridgeDevice::~BridgeDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/connection.cpp
new/networkmanager-qt-5.93.0/src/connection.cpp
--- old/networkmanager-qt-5.92.0/src/connection.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/connection.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -46,7 +46,6 @@
connect(&d->iface,
&OrgFreedesktopNetworkManagerSettingsConnectionInterface::Updated, d,
&ConnectionPrivate::onConnectionUpdated);
connect(&d->iface,
&OrgFreedesktopNetworkManagerSettingsConnectionInterface::Removed, d,
&ConnectionPrivate::onConnectionRemoved);
- d->unsaved = d->iface.unsaved();
QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
d->path,
@@ -54,6 +53,7 @@
QLatin1String("PropertiesChanged"),
d,
SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
+ d->unsaved = d->iface.unsaved();
}
NetworkManager::Connection::~Connection()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/device.cpp
new/networkmanager-qt-5.93.0/src/device.cpp
--- old/networkmanager-qt-5.92.0/src/device.cpp 2022-03-05 12:20:06.000000000
+0100
+++ new/networkmanager-qt-5.93.0/src/device.cpp 2022-04-02 12:05:11.000000000
+0200
@@ -83,6 +83,7 @@
#endif
, uni(path)
, designSpeed(0)
+ , deviceType(Device::UnknownType)
, dhcp4Config(nullptr)
, dhcp6Config(nullptr)
, mtu(0)
@@ -105,9 +106,14 @@
qDBusRegisterMetaType<IpV6DBusRouteList>();
qDBusRegisterMetaType<DeviceDBusStateReason>();
- // This needs to be initialized as soon as possible, because based on this
property
- // we initialize the device type
- deviceType = convertType(deviceIface.deviceType());
+ QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
+ uni,
+
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
+ QLatin1String("PropertiesChanged"),
+ this,
+ SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
+ QObject::connect(&deviceIface,
&OrgFreedesktopNetworkManagerDeviceInterface::StateChanged, this,
&DevicePrivate::deviceStateChanged);
+
deviceStatistics = DeviceStatistics::Ptr(new
NetworkManager::DeviceStatistics(uni), &QObject::deleteLater);
@@ -117,7 +123,6 @@
propertiesChanged(initialProperties);
}
- QObject::connect(&deviceIface,
&OrgFreedesktopNetworkManagerDeviceInterface::StateChanged, this,
&DevicePrivate::deviceStateChanged);
}
NetworkManager::Device::MeteredStatus
NetworkManager::DevicePrivate::convertMeteredStatus(uint metered)
@@ -258,7 +263,7 @@
capabilities =
NetworkManager::DevicePrivate::convertCapabilities(value.toUInt());
Q_EMIT q->capabilitiesChanged();
} else if (property == QLatin1String("DeviceType")) {
- deviceType = static_cast<Device::Type>(value.toUInt());
+ deviceType = convertType(value.toUInt());
} else if (property == QLatin1String("Dhcp4Config")) {
QDBusObjectPath dhcp4ConfigPathTmp = value.value<QDBusObjectPath>();
if (dhcp4ConfigPathTmp.path().isNull()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/genericdevice.cpp
new/networkmanager-qt-5.93.0/src/genericdevice.cpp
--- old/networkmanager-qt-5.92.0/src/genericdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/genericdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -31,13 +31,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::GenericDevice::~GenericDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/gredevice.cpp
new/networkmanager-qt-5.93.0/src/gredevice.cpp
--- old/networkmanager-qt-5.92.0/src/gredevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/gredevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -33,12 +33,6 @@
d->propertiesChanged(initialProperties);
}
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::GreDevice::~GreDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/infinibanddevice.cpp
new/networkmanager-qt-5.93.0/src/infinibanddevice.cpp
--- old/networkmanager-qt-5.92.0/src/infinibanddevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/infinibanddevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -33,13 +33,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::InfinibandDevicePrivate::~InfinibandDevicePrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/iptunneldevice.cpp
new/networkmanager-qt-5.93.0/src/iptunneldevice.cpp
--- old/networkmanager-qt-5.92.0/src/iptunneldevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/iptunneldevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -32,12 +32,6 @@
d->propertiesChanged(initialProperties);
}
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::IpTunnelDevice::~IpTunnelDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/macvlandevice.cpp
new/networkmanager-qt-5.93.0/src/macvlandevice.cpp
--- old/networkmanager-qt-5.92.0/src/macvlandevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/macvlandevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -31,13 +31,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::MacVlanDevice::~MacVlanDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/manager.cpp
new/networkmanager-qt-5.93.0/src/manager.cpp
--- old/networkmanager-qt-5.92.0/src/manager.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/manager.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -20,6 +20,8 @@
#include "bluetoothdevice.h"
#include "bonddevice.h"
#include "bridgedevice.h"
+#include "dbus/deviceinterface.h"
+#include "device_p.h"
#include "genericdevice.h"
#include "gredevice.h"
#include "infinibanddevice.h"
@@ -302,73 +304,60 @@
NetworkManager::Device::Ptr
NetworkManager::NetworkManagerPrivate::createNetworkInterface(const QString
&uni)
{
// qCDebug(NMQT);
- Device::Ptr createdInterface;
- Device::Ptr device(new Device(uni));
- switch (device->type()) {
+ auto message = QDBusMessage::createMethodCall(DBUS_SERVICE, uni,
FDO_DBUS_PROPERTIES, QStringLiteral("Get"));
+
message.setArguments({QLatin1String(OrgFreedesktopNetworkManagerDeviceInterface::staticInterfaceName()),
QStringLiteral("DeviceType")});
+#ifdef NMQT_STATIC
+ auto bus = QDBusConnection::sessionBus();
+#else
+ auto bus = QDBusConnection::systemBus();
+#endif
+ QDBusReply<QVariant> reply = bus.call(message);
+ Device::Type type = reply.isValid() ?
NetworkManager::DevicePrivate::convertType(reply.value().toInt()) :
Device::UnknownType;
+ switch (type) {
case Device::Ethernet:
- createdInterface = Device::Ptr(new NetworkManager::WiredDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::WiredDevice(uni),
&QObject::deleteLater);
case Device::Wifi:
- createdInterface = Device::Ptr(new
NetworkManager::WirelessDevice(uni), &QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::WirelessDevice(uni),
&QObject::deleteLater);
case Device::Modem:
- createdInterface = Device::Ptr(new NetworkManager::ModemDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::ModemDevice(uni),
&QObject::deleteLater);
case Device::Bluetooth:
- createdInterface = Device::Ptr(new
NetworkManager::BluetoothDevice(uni), &QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::BluetoothDevice(uni),
&QObject::deleteLater);
case Device::Wimax:
- createdInterface = Device::Ptr(new NetworkManager::WimaxDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::WimaxDevice(uni),
&QObject::deleteLater);
case Device::OlpcMesh:
- createdInterface = Device::Ptr(new
NetworkManager::OlpcMeshDevice(uni), &QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::OlpcMeshDevice(uni),
&QObject::deleteLater);
case Device::InfiniBand:
- createdInterface = Device::Ptr(new
NetworkManager::InfinibandDevice(uni), &QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::InfinibandDevice(uni),
&QObject::deleteLater);
case Device::Bond:
- createdInterface = Device::Ptr(new NetworkManager::BondDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::BondDevice(uni),
&QObject::deleteLater);
case Device::Vlan:
- createdInterface = Device::Ptr(new NetworkManager::VlanDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::VlanDevice(uni),
&QObject::deleteLater);
case Device::Adsl:
- createdInterface = Device::Ptr(new NetworkManager::AdslDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::AdslDevice(uni),
&QObject::deleteLater);
case Device::Bridge:
- createdInterface = Device::Ptr(new NetworkManager::BridgeDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::BridgeDevice(uni),
&QObject::deleteLater);
// No need to check checkVersion, because we can't get Generic, Gre,
MacVlan, Tun & Veth values in incompatible runtime
case Device::Generic:
- createdInterface = Device::Ptr(new NetworkManager::GenericDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::GenericDevice(uni),
&QObject::deleteLater);
case Device::Gre:
- createdInterface = Device::Ptr(new NetworkManager::GreDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::GreDevice(uni),
&QObject::deleteLater);
case Device::MacVlan:
- createdInterface = Device::Ptr(new NetworkManager::MacVlanDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::MacVlanDevice(uni),
&QObject::deleteLater);
case Device::Tun:
- createdInterface = Device::Ptr(new NetworkManager::TunDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::TunDevice(uni),
&QObject::deleteLater);
case Device::Veth:
- createdInterface = Device::Ptr(new NetworkManager::VethDevice(uni),
&QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::VethDevice(uni),
&QObject::deleteLater);
case Device::IpTunnel:
- createdInterface = Device::Ptr(new
NetworkManager::IpTunnelDevice(uni), &QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::IpTunnelDevice(uni),
&QObject::deleteLater);
case Device::WireGuard:
- createdInterface = Device::Ptr(new
NetworkManager::WireGuardDevice(uni), &QObject::deleteLater);
- break;
+ return Device::Ptr(new NetworkManager::WireGuardDevice(uni),
&QObject::deleteLater);
default:
- createdInterface = device;
if (uni != QLatin1String("any")) { // VPN connections use "any" as uni
for the network interface.
- qCDebug(NMQT) << "Can't create device of type " << device->type()
<< "for" << uni;
+ qCDebug(NMQT) << "Can't create device of type" << type << "for" <<
uni;
}
- break;
}
- return createdInterface;
+ return Device::Ptr(new Device(uni), &QObject::deleteLater);
}
NetworkManager::Status NetworkManager::NetworkManagerPrivate::status() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/modemdevice.cpp
new/networkmanager-qt-5.93.0/src/modemdevice.cpp
--- old/networkmanager-qt-5.92.0/src/modemdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/modemdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -37,13 +37,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::ModemDevice::ModemDevice(NetworkManager::ModemDevicePrivate
&dd, QObject *parent)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/olpcmeshdevice.cpp
new/networkmanager-qt-5.93.0/src/olpcmeshdevice.cpp
--- old/networkmanager-qt-5.92.0/src/olpcmeshdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/olpcmeshdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -30,13 +30,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::OlpcMeshDevice::~OlpcMeshDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/teamdevice.cpp
new/networkmanager-qt-5.93.0/src/teamdevice.cpp
--- old/networkmanager-qt-5.92.0/src/teamdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/teamdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -33,13 +33,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::TeamDevice::~TeamDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/tundevice.cpp
new/networkmanager-qt-5.93.0/src/tundevice.cpp
--- old/networkmanager-qt-5.92.0/src/tundevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/tundevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -31,13 +31,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::TunDevice::~TunDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/vethdevice.cpp
new/networkmanager-qt-5.93.0/src/vethdevice.cpp
--- old/networkmanager-qt-5.92.0/src/vethdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/vethdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -32,13 +32,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::VethDevice::~VethDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/vlandevice.cpp
new/networkmanager-qt-5.93.0/src/vlandevice.cpp
--- old/networkmanager-qt-5.92.0/src/vlandevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/vlandevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -32,13 +32,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::VlanDevicePrivate::~VlanDevicePrivate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/vpnconnection.cpp
new/networkmanager-qt-5.93.0/src/vpnconnection.cpp
--- old/networkmanager-qt-5.92.0/src/vpnconnection.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/vpnconnection.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -37,6 +37,14 @@
{
Q_D(VpnConnection);
+ QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
+ d->path,
+
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
+ QLatin1String("PropertiesChanged"),
+ d,
+ SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
+ connect(&d->iface,
&OrgFreedesktopNetworkManagerVPNConnectionInterface::VpnStateChanged, d,
&VpnConnectionPrivate::vpnStateChanged);
+
// We need to get ActiveConnection's properties, because by default every
ActiveConnection
// is basically a VpnConnection
QVariantMap initialProperties =
@@ -53,14 +61,6 @@
d->propertiesChanged(initialProperties);
}
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->path,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
- connect(&d->iface,
&OrgFreedesktopNetworkManagerVPNConnectionInterface::VpnStateChanged, d,
&VpnConnectionPrivate::vpnStateChanged);
}
NetworkManager::VpnConnection::~VpnConnection()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/wimaxdevice.cpp
new/networkmanager-qt-5.93.0/src/wimaxdevice.cpp
--- old/networkmanager-qt-5.92.0/src/wimaxdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/wimaxdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -32,19 +32,13 @@
{
Q_D(WimaxDevice);
+ connect(&d->wimaxIface,
&OrgFreedesktopNetworkManagerDeviceWiMaxInterface::NspAdded, d,
&WimaxDevicePrivate::nspAdded);
+ connect(&d->wimaxIface,
&OrgFreedesktopNetworkManagerDeviceWiMaxInterface::NspRemoved, d,
&WimaxDevicePrivate::nspRemoved);
+
QVariantMap initialProperties =
NetworkManagerPrivate::retrieveInitialProperties(d->wimaxIface.staticInterfaceName(),
path);
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
- connect(&d->wimaxIface,
&OrgFreedesktopNetworkManagerDeviceWiMaxInterface::NspAdded, d,
&WimaxDevicePrivate::nspAdded);
- connect(&d->wimaxIface,
&OrgFreedesktopNetworkManagerDeviceWiMaxInterface::NspRemoved, d,
&WimaxDevicePrivate::nspRemoved);
}
NetworkManager::WimaxDevice::~WimaxDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/wimaxnsp.cpp
new/networkmanager-qt-5.93.0/src/wimaxnsp.cpp
--- old/networkmanager-qt-5.92.0/src/wimaxnsp.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/wimaxnsp.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -48,10 +48,10 @@
Q_D(WimaxNsp);
d->uni = path;
if (d->iface.isValid()) {
+ connect(&d->iface,
&OrgFreedesktopNetworkManagerWiMaxNspInterface::PropertiesChanged, d,
&WimaxNspPrivate::propertiesChanged);
d->networkType = convertNetworkType(d->iface.networkType());
d->name = d->iface.name();
d->signalQuality = d->iface.signalQuality();
- connect(&d->iface,
&OrgFreedesktopNetworkManagerWiMaxNspInterface::PropertiesChanged, d,
&WimaxNspPrivate::propertiesChanged);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/wireddevice.cpp
new/networkmanager-qt-5.93.0/src/wireddevice.cpp
--- old/networkmanager-qt-5.92.0/src/wireddevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/wireddevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -32,25 +32,16 @@
: Device(*new NetworkManager::WiredDevicePrivate(path, this), parent)
{
Q_D(WiredDevice);
-
+#ifdef NMQT_STATIC
+ connect(&d->wiredIface,
&OrgFreedesktopNetworkManagerDeviceWiredInterface::PropertiesChanged, d,
&WiredDevicePrivate::propertiesChanged);
+#endif
// Get all WiredDevices's properties at once
QVariantMap initialProperties =
NetworkManagerPrivate::retrieveInitialProperties(d->wiredIface.staticInterfaceName(),
path);
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-#ifndef NMQT_STATIC
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
-#endif
-#ifdef NMQT_STATIC
- connect(&d->wiredIface,
&OrgFreedesktopNetworkManagerDeviceWiredInterface::PropertiesChanged, d,
&WiredDevicePrivate::propertiesChanged);
-#endif
}
NetworkManager::WiredDevice::~WiredDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/wireguarddevice.cpp
new/networkmanager-qt-5.93.0/src/wireguarddevice.cpp
--- old/networkmanager-qt-5.92.0/src/wireguarddevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/wireguarddevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -33,13 +33,6 @@
if (!initialProperties.isEmpty()) {
d->propertiesChanged(initialProperties);
}
-
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
}
NetworkManager::WireGuardDevice::~WireGuardDevice()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.92.0/src/wirelessdevice.cpp
new/networkmanager-qt-5.93.0/src/wirelessdevice.cpp
--- old/networkmanager-qt-5.92.0/src/wirelessdevice.cpp 2022-03-05
12:20:06.000000000 +0100
+++ new/networkmanager-qt-5.93.0/src/wirelessdevice.cpp 2022-04-02
12:05:11.000000000 +0200
@@ -36,6 +36,13 @@
qDBusRegisterMetaType<QList<QDBusObjectPath>>();
+#ifdef NMQT_STATIC
+ connect(&d->wirelessIface,
&OrgFreedesktopNetworkManagerDeviceWirelessInterface::PropertiesChanged, d,
&WirelessDevicePrivate::propertiesChanged);
+#endif
+
+ connect(&d->wirelessIface,
&OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointAdded, d,
&WirelessDevicePrivate::accessPointAdded);
+ connect(&d->wirelessIface,
&OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointRemoved, d,
&WirelessDevicePrivate::accessPointRemoved);
+
const QList<QDBusObjectPath> aps = d->wirelessIface.accessPoints();
// qCDebug(NMQT) << "AccessPoint list";
for (const QDBusObjectPath &op : aps) {
@@ -49,21 +56,6 @@
d->propertiesChanged(initialProperties);
}
-#ifndef NMQT_STATIC
- QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE,
- d->uni,
-
NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
- QLatin1String("PropertiesChanged"),
- d,
- SLOT(dbusPropertiesChanged(QString,
QVariantMap, QStringList)));
-#endif
-
-#ifdef NMQT_STATIC
- connect(&d->wirelessIface,
&OrgFreedesktopNetworkManagerDeviceWirelessInterface::PropertiesChanged, d,
&WirelessDevicePrivate::propertiesChanged);
-#endif
-
- connect(&d->wirelessIface,
&OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointAdded, d,
&WirelessDevicePrivate::accessPointAdded);
- connect(&d->wirelessIface,
&OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointRemoved, d,
&WirelessDevicePrivate::accessPointRemoved);
}
NetworkManager::WirelessDevice::~WirelessDevice()
