Changeset View
Changeset View
Standalone View
Standalone View
src/macvlandevice.cpp
Show All 40 Lines | |||||
41 | { | 41 | { | ||
42 | Q_D(MacVlanDevice); | 42 | Q_D(MacVlanDevice); | ||
43 | 43 | | |||
44 | QVariantMap initialProperties = NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(), path); | 44 | QVariantMap initialProperties = NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(), path); | ||
45 | if (!initialProperties.isEmpty()) { | 45 | if (!initialProperties.isEmpty()) { | ||
46 | d->propertiesChanged(initialProperties); | 46 | d->propertiesChanged(initialProperties); | ||
47 | } | 47 | } | ||
48 | 48 | | |||
49 | #if NM_CHECK_VERSION(1, 4, 0) | | |||
50 | QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, | 49 | QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->uni, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, | ||
51 | QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); | 50 | QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); | ||
52 | #else | | |||
53 | connect(&d->iface, &OrgFreedesktopNetworkManagerDeviceMacvlanInterface::PropertiesChanged, d, &MacVlanDevicePrivate::propertiesChanged); | | |||
54 | #endif | | |||
55 | } | 51 | } | ||
56 | 52 | | |||
57 | NetworkManager::MacVlanDevice::~MacVlanDevice() | 53 | NetworkManager::MacVlanDevice::~MacVlanDevice() | ||
58 | { | 54 | { | ||
59 | } | 55 | } | ||
60 | 56 | | |||
61 | NetworkManager::Device::Type NetworkManager::MacVlanDevice::type() const | 57 | NetworkManager::Device::Type NetworkManager::MacVlanDevice::type() const | ||
62 | { | 58 | { | ||
Show All 38 Lines |