diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2018-08-22 15:30:28 +0300 |
---|---|---|
committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2018-08-24 07:24:46 +0000 |
commit | 9034db2caa91a686fb8e783b13f3ad5723285bc8 (patch) | |
tree | e266dbc3a983aad25d4ac712c5a4831e1612c28b /src/networksettings/connman/qnetworksettingsmanager_p.h | |
parent | 1dabfa51cb834efd85ccb60e70e2ce3558b4deaf (diff) |
Fix connman connection initialization after it is available
Currently if connman service is not up and running, we never try again
to initialize connection to it and request network information.
* Requires at least d-bus daemon to be running
Change-Id: I70b0358ee255174edce8d578517e9df091206ceb
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsmanager_p.h')
-rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index cfc2e64..d2146a9 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -79,7 +79,9 @@ public slots: void requestInput(const QString& service, const QString& type); void onServicesChanged(ConnmanMapStructList changed, const QList<QDBusObjectPath> &removed); void serviceReady(); + void onConnmanServiceRegistered(const QString &serviceName); private: + bool initialize(); void handleNewService(const QString& servicePath); protected: QNetworkSettingsInterfaceModel m_interfaceModel; @@ -90,8 +92,10 @@ protected: private: NetConnmanManagerInterface *m_manager; QNetworkSettingsUserAgent *m_agent; + QDBusServiceWatcher *m_serviceWatcher; QString m_currentSsid; QNetworkSettingsService *m_currentWifiConnection; + bool m_initialized; }; QT_END_NAMESPACE |