fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 16:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/ethernet: use nm_clear_g*() function in remove_supplicant_interface_error_handler()

Browse source 
(cherry picked from commit 30f72c2753)
This commit is contained in:
Thomas Haller 2016-01-19 13:39:02 +01:00
parent 3822c7d6cc
commit 83bf1a7c86
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/devices/nm-device-ethernet.c
View file

@ -444,15 +444,8 @@ remove_supplicant_interface_error_handler (NMDeviceEthernet *self)
{
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
if (priv->supplicant.iface_error_id != 0) {
g_signal_handler_disconnect (priv->supplicant.iface, priv->supplicant.iface_error_id);
priv->supplicant.iface_error_id = 0;
}
if (priv->supplicant.iface_con_error_cb_id > 0) {
g_source_remove (priv->supplicant.iface_con_error_cb_id);
priv->supplicant.iface_con_error_cb_id = 0;
}
nm_clear_g_signal_handler (priv->supplicant.iface, &priv->supplicant.iface_error_id);
nm_clear_g_source (&priv->supplicant.iface_con_error_cb_id);
}
static void
@ -463,10 +456,7 @@ supplicant_interface_release (NMDeviceEthernet *self)
remove_supplicant_timeouts (self);
remove_supplicant_interface_error_handler (self);
if (priv->supplicant.iface_state_id > 0) {
g_signal_handler_disconnect (priv->supplicant.iface, priv->supplicant.iface_state_id);
priv->supplicant.iface_state_id = 0;
}
nm_clear_g_signal_handler (priv->supplicant.iface, &priv->supplicant.iface_state_id);
if (priv->supplicant.iface) {
nm_supplicant_interface_disconnect (priv->supplicant.iface);