From 6fc586f5f9f783804638401110e12043410073a1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 2 Mar 2011 17:32:47 -0600 Subject: [PATCH] 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. --- 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 bb34d16..209bfb3 100644 --- a/src/pk-network-stack-nm.c +++ b/src/pk-network-stack-nm.c @@ -32,6 +32,10 @@ #include "pk-conf.h" #include "pk-marshal.h" +#ifndef NM_CHECK_VERSION +#define NM_CHECK_VERSION(x,y,z) 0 +#endif + struct PkNetworkStackNmPrivate { EggDbusMonitor *dbus_monitor; @@ -236,8 +240,13 @@ pk_network_stack_nm_get_state (PkNetworkStack *nstack) case NM_DEVICE_TYPE_WIFI: ret = PK_NETWORK_ENUM_WIFI; break; +#if NM_CHECK_VERSION(0,8,992) + case NM_DEVICE_TYPE_WIMAX: + case NM_DEVICE_TYPE_MODEM: +#else case NM_DEVICE_TYPE_GSM: case NM_DEVICE_TYPE_CDMA: +#endif case NM_DEVICE_TYPE_BT: ret = PK_NETWORK_ENUM_MOBILE; break; -- 1.7.4.1