diff options
author | Dan Williams <dcbw@redhat.com> | 2011-03-02 17:32:47 -0600 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2011-03-03 11:12:56 +0000 |
commit | bc795379399a7315fe9a1d3c3ffc03ecbbcbe904 (patch) | |
tree | 9cacbaa20b621dc4643c46787f78a0268855061e | |
parent | 891a5a49d8c7c34d31f7646d7da9cf897979aa3d (diff) |
network: update for NetworkManager 0.9 snapshots
NM 0.9 consolidates modem devices as the hard separation between
access technology families is not flexible enough with all the
new multi-mode devices starting to show up.
Also, add support for WiMAX mobile broadband.
Signed-off-by: Richard Hughes <richard@hughsie.com>
-rw-r--r-- | src/pk-network-stack-nm.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/pk-network-stack-nm.c b/src/pk-network-stack-nm.c index bb34d1646..209bfb384 100644 --- a/src/pk-network-stack-nm.c +++ b/src/pk-network-stack-nm.c | |||
@@ -32,6 +32,10 @@ | |||
32 | #include "pk-conf.h" | 32 | #include "pk-conf.h" |
33 | #include "pk-marshal.h" | 33 | #include "pk-marshal.h" |
34 | 34 | ||
35 | #ifndef NM_CHECK_VERSION | ||
36 | #define NM_CHECK_VERSION(x,y,z) 0 | ||
37 | #endif | ||
38 | |||
35 | struct PkNetworkStackNmPrivate | 39 | struct PkNetworkStackNmPrivate |
36 | { | 40 | { |
37 | EggDbusMonitor *dbus_monitor; | 41 | EggDbusMonitor *dbus_monitor; |
@@ -236,8 +240,13 @@ pk_network_stack_nm_get_state (PkNetworkStack *nstack) | |||
236 | case NM_DEVICE_TYPE_WIFI: | 240 | case NM_DEVICE_TYPE_WIFI: |
237 | ret = PK_NETWORK_ENUM_WIFI; | 241 | ret = PK_NETWORK_ENUM_WIFI; |
238 | break; | 242 | break; |
243 | #if NM_CHECK_VERSION(0,8,992) | ||
244 | case NM_DEVICE_TYPE_WIMAX: | ||
245 | case NM_DEVICE_TYPE_MODEM: | ||
246 | #else | ||
239 | case NM_DEVICE_TYPE_GSM: | 247 | case NM_DEVICE_TYPE_GSM: |
240 | case NM_DEVICE_TYPE_CDMA: | 248 | case NM_DEVICE_TYPE_CDMA: |
249 | #endif | ||
241 | case NM_DEVICE_TYPE_BT: | 250 | case NM_DEVICE_TYPE_BT: |
242 | ret = PK_NETWORK_ENUM_MOBILE; | 251 | ret = PK_NETWORK_ENUM_MOBILE; |
243 | break; | 252 | break; |