From 14b23ba3991eb8e5f44330380fcae4d1940a8a2f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 17 Mar 2011 13:39:09 -0500 Subject: [PATCH] libnm-glib: handle new device states The device states aren't used yet, but handle them anyway. --- libnm-glib/nm-device-wifi.c | 10 ++++++---- libnm-glib/nm-device-wimax.c | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index 621c22f183..c58e70d3b0 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -209,15 +209,14 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device) state = nm_device_get_state (NM_DEVICE (device)); switch (state) { - case NM_DEVICE_STATE_PREPARE: - case NM_DEVICE_STATE_CONFIG: - case NM_DEVICE_STATE_NEED_AUTH: case NM_DEVICE_STATE_IP_CONFIG: + case NM_DEVICE_STATE_IP_CHECK: + case NM_DEVICE_STATE_SECONDARIES: case NM_DEVICE_STATE_ACTIVATED: + case NM_DEVICE_STATE_DEACTIVATING: break; default: return 0; - break; } priv = NM_DEVICE_WIFI_GET_PRIVATE (device); @@ -281,7 +280,10 @@ nm_device_wifi_get_active_access_point (NMDeviceWifi *device) case NM_DEVICE_STATE_CONFIG: case NM_DEVICE_STATE_NEED_AUTH: case NM_DEVICE_STATE_IP_CONFIG: + case NM_DEVICE_STATE_IP_CHECK: + case NM_DEVICE_STATE_SECONDARIES: case NM_DEVICE_STATE_ACTIVATED: + case NM_DEVICE_STATE_DEACTIVATING: break; default: return NULL; diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c index fdd34c2a52..7278a471b8 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -162,7 +162,10 @@ nm_device_wimax_get_active_nsp (NMDeviceWimax *wimax) case NM_DEVICE_STATE_CONFIG: case NM_DEVICE_STATE_NEED_AUTH: case NM_DEVICE_STATE_IP_CONFIG: + case NM_DEVICE_STATE_IP_CHECK: + case NM_DEVICE_STATE_SECONDARIES: case NM_DEVICE_STATE_ACTIVATED: + case NM_DEVICE_STATE_DEACTIVATING: break; default: return NULL;