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

core: cleanup arguments for GObject signal of NMDhcpClient

Browse source
This commit is contained in:
Thomas Haller 2021-08-05 09:11:14 +02:00
parent 3f6365f5d0
commit b4e4b8d614
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/devices/nm-device.c
View file

@ -9970,7 +9970,7 @@ dhcp6_state_changed(NMDhcpClient *client,
}
static void
dhcp6_prefix_delegated(NMDhcpClient *client, NMPlatformIP6Address *prefix, gpointer user_data)
dhcp6_prefix_delegated(NMDhcpClient *client, const NMPlatformIP6Address *prefix, gpointer user_data)
{
NMDevice *self = NM_DEVICE(user_data);
@ -19122,16 +19122,17 @@ nm_device_class_init(NMDeviceClass *klass)
G_TYPE_OBJECT,
G_TYPE_OBJECT);
signals[IP6_PREFIX_DELEGATED] = g_signal_new(NM_DEVICE_IP6_PREFIX_DELEGATED,
G_OBJECT_CLASS_TYPE(object_class),
G_SIGNAL_RUN_FIRST,
0,
NULL,
NULL,
NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
signals[IP6_PREFIX_DELEGATED] =
g_signal_new(NM_DEVICE_IP6_PREFIX_DELEGATED,
G_OBJECT_CLASS_TYPE(object_class),
G_SIGNAL_RUN_FIRST,
0,
NULL,
NULL,
NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER /* const NMPlatformIP6Address *prefix */);
signals[IP6_SUBNET_NEEDED] = g_signal_new(NM_DEVICE_IP6_SUBNET_NEEDED,
G_OBJECT_CLASS_TYPE(object_class),

28
src/core/dhcp/nm-dhcp-client.c
View file

@ -497,7 +497,12 @@ nm_dhcp_client_set_state(NMDhcpClient *self,
}
priv->state = new_state;
g_signal_emit(G_OBJECT(self), signals[SIGNAL_STATE_CHANGED], 0, new_state, ip_config, options);
g_signal_emit(G_OBJECT(self),
signals[SIGNAL_STATE_CHANGED],
0,
(guint) new_state,
ip_config,
options);
}
static gboolean
@ -1382,14 +1387,15 @@ nm_dhcp_client_class_init(NMDhcpClientClass *client_class)
G_TYPE_OBJECT,
G_TYPE_HASH_TABLE);
signals[SIGNAL_PREFIX_DELEGATED] = g_signal_new(NM_DHCP_CLIENT_SIGNAL_PREFIX_DELEGATED,
G_OBJECT_CLASS_TYPE(object_class),
G_SIGNAL_RUN_FIRST,
0,
NULL,
NULL,
NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
signals[SIGNAL_PREFIX_DELEGATED] =
g_signal_new(NM_DHCP_CLIENT_SIGNAL_PREFIX_DELEGATED,
G_OBJECT_CLASS_TYPE(object_class),
G_SIGNAL_RUN_FIRST,
0,
NULL,
NULL,
NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER /* const NMPlatformIP6Address *prefix */);
}

4
src/core/nm-policy.c
View file

@ -322,7 +322,9 @@ ip6_remove_device_prefix_delegations(NMPolicy *self, NMDevice *device)
}
static void
device_ip6_prefix_delegated(NMDevice *device, NMPlatformIP6Address *prefix, gpointer user_data)
device_ip6_prefix_delegated(NMDevice * device,
const NMPlatformIP6Address *prefix,
gpointer user_data)
{
NMPolicyPrivate * priv = user_data;
NMPolicy * self = _PRIV_TO_SELF(priv);