diff options
Diffstat (limited to 'src/devices/wifi')
| -rw-r--r-- | src/devices/wifi/nm-device-olpc-mesh.c | 8 | ||||
| -rw-r--r-- | src/devices/wifi/nm-device-wifi.c | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index ac78757d..3a4a027a 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -107,12 +107,8 @@ check_connection_compatible (NMDevice *device, NMConnection *connection) } static gboolean -can_auto_connect (NMDevice *device, - NMConnection *connection, - char **specific_object) +get_autoconnect_allowed (NMDevice *device) { - nm_assert (!specific_object || !*specific_object); - return FALSE; } @@ -517,7 +513,7 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass) object_class->dispose = dispose; parent_class->check_connection_compatible = check_connection_compatible; - parent_class->can_auto_connect = can_auto_connect; + parent_class->get_autoconnect_allowed = get_autoconnect_allowed; parent_class->complete_connection = complete_connection; parent_class->is_available = is_available; parent_class->act_stage1_prepare = act_stage1_prepare; diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 8bfddbd9..5e92f47b 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -997,9 +997,6 @@ get_autoconnect_allowed (NMDevice *device) { NMDeviceWifiPrivate *priv; - if (!NM_DEVICE_CLASS (nm_device_wifi_parent_class)->get_autoconnect_allowed (device)) - return FALSE; - priv = NM_DEVICE_WIFI_GET_PRIVATE (NM_DEVICE_WIFI (device)); return !priv->requested_scan; } |