summaryrefslogtreecommitdiffstats
path: root/src/networksettings/connman/qnetworksettingsmanager_p.cpp
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@qt.io>2017-08-03 19:13:52 +0300
committerVille Voutilainen <ville.voutilainen@qt.io>2017-08-04 10:21:09 +0000
commit1671759a9ef01b1e6533d4caf72cfd1ac3c9223e (patch)
tree3ffdf098e05b9a47769c429985b1393401177e4e /src/networksettings/connman/qnetworksettingsmanager_p.cpp
parent132c80442f8820e3b82ab21f649c810bddd38d3f (diff)
Introduce a placeholder for removed wired networks
Disable entering the wired network settings when none have been seen. When a wired network is cable-disconnected, leave a placeholder for it. When a new wired network is cable-connected, replace the placeholder with that. Task-number: QTBUG-60979 Change-Id: I8eeb20d25d765c7bb104ad2e698e4d0686c8dc2d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsmanager_p.cpp')
-rw-r--r--src/networksettings/connman/qnetworksettingsmanager_p.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index 22e8005..e3f6d0b 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -114,6 +114,7 @@ void QNetworkSettingsManagerPrivate::getTechnologiesFinished(QDBusPendingCallWat
foreach (const ConnmanMapStruct &object, reply.value()) {
ConnmanSettingsInterface *item = new ConnmanSettingsInterface(object.objectPath.path(), object.propertyMap, this);
+ item->scanServices();
if (item->type() == QNetworkSettingsType::Wired) {
m_interfaceModel.insert(0, item);
@@ -158,6 +159,9 @@ void QNetworkSettingsManagerPrivate::handleNewService(const QString &servicePath
if (service->name().length() > 0 && service->type() != QNetworkSettingsType::Unknown) {
m_serviceModel->append(service);
emit q->servicesChanged();
+ if (service->type() == QNetworkSettingsType::Wired) {
+ m_serviceFilter->setWiredNetworksAvailable(true);
+ }
}
else {
//Service name or type not set, wait for update
@@ -180,6 +184,9 @@ void QNetworkSettingsManagerPrivate::serviceReady()
service->disconnect(this);
m_serviceModel->append(service);
emit q->servicesChanged();
+ if (service->type() == QNetworkSettingsType::Wired) {
+ m_serviceFilter->setWiredNetworksAvailable(true);
+ }
//Update the interface state accordingly
foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) {