Changeset View
Changeset View
Standalone View
Standalone View
src/vpnconnection.cpp
Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Line(s) | 53 | { | |||
---|---|---|---|---|---|
64 | if (vpn()) { | 64 | if (vpn()) { | ||
65 | // Get all VpnConnection's properties at once | 65 | // Get all VpnConnection's properties at once | ||
66 | QVariantMap initialProperties = NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(), path); | 66 | QVariantMap initialProperties = NetworkManagerPrivate::retrieveInitialProperties(d->iface.staticInterfaceName(), path); | ||
67 | if (!initialProperties.isEmpty()) { | 67 | if (!initialProperties.isEmpty()) { | ||
68 | d->propertiesChanged(initialProperties); | 68 | d->propertiesChanged(initialProperties); | ||
69 | } | 69 | } | ||
70 | } | 70 | } | ||
71 | 71 | | |||
72 | #if NM_CHECK_VERSION(1, 4, 0) | | |||
73 | QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, | 72 | QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, | ||
74 | QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); | 73 | QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); | ||
75 | #else | | |||
76 | connect(&d->iface, &OrgFreedesktopNetworkManagerVPNConnectionInterface::PropertiesChanged, d, &VpnConnectionPrivate::propertiesChanged); | | |||
77 | #endif | | |||
78 | connect(&d->iface, &OrgFreedesktopNetworkManagerVPNConnectionInterface::VpnStateChanged, d, &VpnConnectionPrivate::vpnStateChanged); | 74 | connect(&d->iface, &OrgFreedesktopNetworkManagerVPNConnectionInterface::VpnStateChanged, d, &VpnConnectionPrivate::vpnStateChanged); | ||
79 | } | 75 | } | ||
80 | 76 | | |||
81 | NetworkManager::VpnConnection::~VpnConnection() | 77 | NetworkManager::VpnConnection::~VpnConnection() | ||
82 | { | 78 | { | ||
83 | } | 79 | } | ||
84 | 80 | | |||
85 | QString NetworkManager::VpnConnection::banner() const | 81 | QString NetworkManager::VpnConnection::banner() const | ||
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines |