From 1671759a9ef01b1e6533d4caf72cfd1ac3c9223e Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Thu, 3 Aug 2017 19:13:52 +0300 Subject: 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 --- src/networksettings/connman/qnetworksettingsmanager_p.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/networksettings/connman/qnetworksettingsmanager_p.cpp') 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()) { -- cgit v1.2.3