fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 17:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: drop stub implementation of get_autoconnect_allowed() in NMDevice

Browse source 
(cherry picked from commit 9a7e668dbb)
This commit is contained in:
Thomas Haller 2017-11-02 16:00:41 +01:00
parent 1729255940
commit b49c6fb98a
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/devices/nm-device.c
View file

@ -4271,12 +4271,6 @@ nm_device_set_autoconnect_both (NMDevice *self, gboolean autoconnect)
nm_device_set_autoconnect_full (self, autoconnect, autoconnect);
}
static gboolean
get_autoconnect_allowed (NMDevice *self)
{
return TRUE;
}
static gboolean
autoconnect_allowed_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
@ -4303,8 +4297,11 @@ nm_device_autoconnect_allowed (NMDevice *self)
GValue instance = G_VALUE_INIT;
GValue retval = G_VALUE_INIT;
if ( !nm_device_get_autoconnect (self)
|| !klass->get_autoconnect_allowed (self))
if (!nm_device_get_autoconnect (self))
return FALSE;
if ( klass->get_autoconnect_allowed
&& !klass->get_autoconnect_allowed (self))
return FALSE;
/* Unrealized devices can always autoconnect. */
@ -14668,7 +14665,6 @@ nm_device_class_init (NMDeviceClass *klass)
klass->act_stage4_ip6_config_timeout = act_stage4_ip6_config_timeout;
klass->get_type_description = get_type_description;
klass->get_autoconnect_allowed = get_autoconnect_allowed;
klass->can_auto_connect = can_auto_connect;
klass->check_connection_compatible = check_connection_compatible;
klass->check_connection_available = check_connection_available;

3
src/devices/wifi/nm-device-wifi.c
View file

@ -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;
}