3 files changed, 45 insertions, 21 deletions

diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index 6fecd86..22e8005 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -98,25 +98,7 @@ void QNetworkSettingsManagerPrivate::getServicesFinished(QDBusPendingCallWatcher
 
     foreach (const ConnmanMapStruct &object, reply.value()) {
         const QString servicePath = object.objectPath.path();
-        QNetworkSettingsService *service = new QNetworkSettingsService(servicePath, this);
-        m_serviceModel->append(service);
-
-        //Update status property
-        QString n = qdbus_cast<QString>(object.propertyMap[PropertyName]);
-        QString t = qdbus_cast<QString>(object.propertyMap[PropertyType]);
-        QString s = qdbus_cast<QString>(object.propertyMap[PropertyState]);
-
-        QNetworkSettingsType type;
-        t >> type;
-        QNetworkSettingsState state;
-        s >> state;
-
-        foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) {
-            ConnmanSettingsInterface* technology = qobject_cast<ConnmanSettingsInterface*>(item);
-            if (technology->name() == n && technology->type() == type.type()) {
-                technology->setState(state.state());
-            }
-        }
+        handleNewService(servicePath);
     }
     emit q->servicesChanged();
 }
@@ -161,9 +143,26 @@ void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList chan
         if (!found)
             newServices.append(map.objectPath.path());
     }
+
     foreach (QString newService, newServices) {
-        QNetworkSettingsService *service = new QNetworkSettingsService(newService, this);
+        handleNewService(newService);
+    }
+}
+
+void QNetworkSettingsManagerPrivate::handleNewService(const QString &servicePath)
+{
+    Q_Q(QNetworkSettingsManager);
+
+    QNetworkSettingsService *service = new QNetworkSettingsService(servicePath, this);
+
+    if (service->name().length() > 0 && service->type() != QNetworkSettingsType::Unknown) {
         m_serviceModel->append(service);
+        emit q->servicesChanged();
+    }
+    else {
+        //Service name or type not set, wait for update
+        connect(service, &QNetworkSettingsService::nameChanged, this, &QNetworkSettingsManagerPrivate::serviceReady);
+        connect(service, &QNetworkSettingsService::typeChanged, this, &QNetworkSettingsManagerPrivate::serviceReady);
     }
 }
 
@@ -171,3 +170,24 @@ void QNetworkSettingsManagerPrivate::setUserAgent(QNetworkSettingsUserAgent *age
 {
     m_agent = agent;
 }
+
+void QNetworkSettingsManagerPrivate::serviceReady()
+{
+    Q_Q(QNetworkSettingsManager);
+
+    QNetworkSettingsService* service = qobject_cast<QNetworkSettingsService*>(sender());
+    if (service->name().length() > 0 && service->type() != QNetworkSettingsType::Unknown) {
+        service->disconnect(this);
+        m_serviceModel->append(service);
+        emit q->servicesChanged();
+
+        //Update the interface state accordingly
+        foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) {
+            ConnmanSettingsInterface* technology = qobject_cast<ConnmanSettingsInterface*>(item);
+            if (technology->name() == service->name() && technology->type() == service->type()) {
+                technology->setState(technology->state());
+            }
+        }
+
+    }
+}
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h
index 5eb5470..b6e23ab 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.h
@@ -38,6 +38,7 @@
 class NetConnmanManagerInterface;
 class QNetworkSettingsServiceModel;
 class QNetworkSettingsServiceFilter;
+class QNetworkSettingsService;
 
 class QNetworkSettingsManagerPrivate : public QObject
 {
@@ -53,7 +54,9 @@ public slots:
     void getTechnologiesFinished(QDBusPendingCallWatcher *watcher);
     void requestInput(const QString& service, const QString& type);
     void onServicesChanged(ConnmanMapStructList changed, const QList<QDBusObjectPath> &removed);
-
+    void serviceReady();
+private:
+    void handleNewService(const QString& servicePath);
 protected:
     QNetworkSettingsInterfaceModel m_interfaceModel;
     QNetworkSettingsServiceModel *m_serviceModel;
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp
index 8a7b2cf..e8aabff 100644
--- a/src/networksettings/connman/qnetworksettingsservice_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp
@@ -362,6 +362,7 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV
     else if (key == PropertyType) {
         QString value = qdbus_cast<QString>(val);
         value >> m_type;
+        emit q->typeChanged();
     }
     else if (key == PropertyStrength) {
         m_wifiConfig.setSignalStrength(val.toInt());