diff options
author | Lorn Potter <lorn.potter@jollamobile.com> | 2014-10-20 11:31:00 +1000 |
---|---|---|
committer | Lorn Potter <lorn.potter@gmail.com> | 2014-10-27 05:32:58 +0100 |
commit | 0ca0ecdb32b3d7df76fe9782d04493ebe0da0a9e (patch) | |
tree | 2df1907b38e1c7c5bd81108835155ba8d73673d5 /src/plugins/bearer/networkmanager/qnetworkmanagerservice.h | |
parent | 6c308e6f1de8f6dfe1938dfbfec55a6881de898a (diff) |
Make networkmanager bearer backend work better
This fixes QNetworkConfigurations when user:
- configures new AP
- deletes connection configuration
- switches wifi AP
Change-Id: I38c543c6de7b61f49d7ac96fa05f7a6fc4fba70f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/plugins/bearer/networkmanager/qnetworkmanagerservice.h')
-rw-r--r-- | src/plugins/bearer/networkmanager/qnetworkmanagerservice.h | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h index 8cda02482b..11ddaf7088 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h @@ -64,31 +64,32 @@ typedef enum NMDeviceType { DEVICE_TYPE_UNKNOWN = 0, - DEVICE_TYPE_802_3_ETHERNET, - DEVICE_TYPE_802_11_WIRELESS, - DEVICE_TYPE_GSM, - DEVICE_TYPE_CDMA + DEVICE_TYPE_ETHERNET, + DEVICE_TYPE_WIFI, + DEVICE_TYPE_MODEM = 8 } NMDeviceType; typedef enum { NM_DEVICE_STATE_UNKNOWN = 0, - NM_DEVICE_STATE_UNMANAGED, - NM_DEVICE_STATE_UNAVAILABLE, - NM_DEVICE_STATE_DISCONNECTED, - NM_DEVICE_STATE_PREPARE, - NM_DEVICE_STATE_CONFIG, - NM_DEVICE_STATE_NEED_AUTH, - NM_DEVICE_STATE_IP_CONFIG, - NM_DEVICE_STATE_ACTIVATED, - NM_DEVICE_STATE_FAILED + NM_DEVICE_STATE_UNMANAGED = 10, + NM_DEVICE_STATE_UNAVAILABLE = 20, + NM_DEVICE_STATE_DISCONNECTED = 30, + NM_DEVICE_STATE_PREPARE = 40, + NM_DEVICE_STATE_CONFIG = 50, + NM_DEVICE_STATE_NEED_AUTH = 60, + NM_DEVICE_STATE_IP_CONFIG = 70, + NM_DEVICE_STATE_ACTIVATED = 100, + NM_DEVICE_STATE_DEACTIVATING = 110, + NM_DEVICE_STATE_FAILED = 120 } NMDeviceState; typedef enum { NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0, NM_ACTIVE_CONNECTION_STATE_ACTIVATING, - NM_ACTIVE_CONNECTION_STATE_ACTIVATED + NM_ACTIVE_CONNECTION_STATE_ACTIVATED, + NM_ACTIVE_CONNECTION_STATE_DEACTIVATED } NMActiveConnectionState; #define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" @@ -257,7 +258,8 @@ public: Q_SIGNALS: void stateChanged(const QString &, quint32); - + void propertiesChanged(const QString &, QMap<QString,QVariant>); + void connectionsChanged(QStringList); private: QNetworkManagerInterfaceDevicePrivate *d; QNmDBusHelper *nmDBusHelper; @@ -321,10 +323,14 @@ public: bool setConnections(); bool isValid(); + void requestScan(); Q_SIGNALS: void propertiesChanged( const QString &, QMap<QString,QVariant>); - void accessPointAdded(const QString &,QDBusObjectPath); - void accessPointRemoved(const QString &,QDBusObjectPath); + void accessPointAdded(const QString &); + void accessPointRemoved(const QString &); + void scanDone(); +private Q_SLOTS: + void scanIsDone(); private: QNetworkManagerInterfaceDeviceWirelessPrivate *d; QNmDBusHelper *nmDBusHelper; @@ -378,6 +384,7 @@ public: QDBusInterface *connectionInterface() const; QList <QDBusObjectPath> listConnections(); + QString getConnectionByUuid(const QString &uuid); bool setConnections(); bool isValid(); @@ -412,7 +419,7 @@ public: Q_SIGNALS: - void updated(const QNmSettingsMap &settings); + void updated(); void removed(const QString &path); private: |