summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2011-03-02 17:32:47 -0600
committerRichard Hughes <richard@hughsie.com>2011-03-03 11:12:56 +0000
commitbc795379399a7315fe9a1d3c3ffc03ecbbcbe904 (patch)
tree9cacbaa20b621dc4643c46787f78a0268855061e
parent891a5a49d8c7c34d31f7646d7da9cf897979aa3d (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.c9
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 @@
#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;