fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 06:40:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppp/trivial: rename field

Browse source
This commit is contained in:
Beniamino Galvani 2018-01-08 16:55:07 +01:00
parent dd98ada33f
commit 41ef5853e6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/devices/nm-device-ppp.c
View file

@ -35,7 +35,7 @@ _LOG_DECLARE_SELF(NMDevicePpp);
typedef struct _NMDevicePppPrivate {
NMPPPManager *ppp_manager;
NMIP4Config *pending_ip4_config;
NMIP4Config *ip4_config;
} NMDevicePppPrivate;
struct _NMDevicePpp {
@ -130,9 +130,9 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
return;
}
} else {
if (priv->pending_ip4_config)
g_object_unref (priv->pending_ip4_config);
priv->pending_ip4_config = g_object_ref (config);
if (priv->ip4_config)
g_object_unref (priv->ip4_config);
priv->ip4_config = g_object_ref (config);
}
}
@ -151,7 +151,7 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason)
s_pppoe = (NMSettingPppoe *) nm_device_get_applied_setting ((NMDevice *) self, NM_TYPE_SETTING_PPPOE);
g_return_val_if_fail (s_pppoe, NM_ACT_STAGE_RETURN_FAILURE);
g_clear_object (&priv->pending_ip4_config);
g_clear_object (&priv->ip4_config);
priv->ppp_manager = nm_ppp_manager_create (nm_setting_pppoe_get_parent (s_pppoe), &error);
@ -197,11 +197,11 @@ act_stage3_ip4_config_start (NMDevice *device,
NMDevicePpp *self = NM_DEVICE_PPP (device);
NMDevicePppPrivate *priv = NM_DEVICE_PPP_GET_PRIVATE (self);
if (priv->pending_ip4_config) {
if (priv->ip4_config) {
if (out_config)
*out_config = g_steal_pointer (&priv->pending_ip4_config);
*out_config = g_steal_pointer (&priv->ip4_config);
else
g_clear_object (&priv->pending_ip4_config);
g_clear_object (&priv->ip4_config);
return NM_ACT_STAGE_RETURN_SUCCESS;
}
@ -257,7 +257,7 @@ dispose (GObject *object)
NMDevicePpp *self = NM_DEVICE_PPP (object);
NMDevicePppPrivate *priv = NM_DEVICE_PPP_GET_PRIVATE (self);
g_clear_object (&priv->pending_ip4_config);
g_clear_object (&priv->ip4_config);
G_OBJECT_CLASS (nm_device_ppp_parent_class)->dispose (object);
}