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

ndisc: rename NM_NDISC_RA_TIMEOUT signal to NM_NDISC_RA_TIMEOUT_SIGNAL

Browse source 
We will add a property NM_NDISC_RA_TIMEOUT for which this name is better
suited. The problem is really that our convention for object properties
and signals defines have no prefix to indicate whether it's a property
or a signal.

Rename.

(cherry picked from commit 10f0253f2e)
This commit is contained in:
Thomas Haller 2020-02-14 17:21:46 +01:00
parent 7c86bc9c97
commit 1f4c8a0f54
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10086,7 +10086,7 @@ addrconf6_start_with_link_ready (NMDevice *self)
G_CALLBACK (ndisc_config_changed), G_CALLBACK (ndisc_config_changed),
self); self);
priv->ndisc_timeout_id = g_signal_connect (priv->ndisc, priv->ndisc_timeout_id = g_signal_connect (priv->ndisc,
NM_NDISC_RA_TIMEOUT, NM_NDISC_RA_TIMEOUT_SIGNAL,
G_CALLBACK (ndisc_ra_timeout), G_CALLBACK (ndisc_ra_timeout),
self); self);

8
src/ndisc/nm-ndisc.c
View file

@ -74,7 +74,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
enum { enum {
CONFIG_RECEIVED, CONFIG_RECEIVED,
RA_TIMEOUT, RA_TIMEOUT_SIGNAL,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -898,7 +898,7 @@ ndisc_ra_timeout_cb (gpointer user_data)
NMNDisc *ndisc = NM_NDISC (user_data); NMNDisc *ndisc = NM_NDISC (user_data);
NM_NDISC_GET_PRIVATE (ndisc)->ra_timeout_id = 0; NM_NDISC_GET_PRIVATE (ndisc)->ra_timeout_id = 0;
g_signal_emit (ndisc, signals[RA_TIMEOUT], 0); g_signal_emit (ndisc, signals[RA_TIMEOUT_SIGNAL], 0);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -1479,8 +1479,8 @@ nm_ndisc_class_init (NMNDiscClass *klass)
0, 0,
NULL, NULL, NULL, NULL, NULL, NULL,
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT); G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT);
signals[RA_TIMEOUT] = signals[RA_TIMEOUT_SIGNAL] =
g_signal_new (NM_NDISC_RA_TIMEOUT, g_signal_new (NM_NDISC_RA_TIMEOUT_SIGNAL,
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
0, 0,

4
src/ndisc/nm-ndisc.h
View file

@ -34,8 +34,8 @@
#define NM_NDISC_ROUTER_SOLICITATIONS "router-solicitations" #define NM_NDISC_ROUTER_SOLICITATIONS "router-solicitations"
#define NM_NDISC_ROUTER_SOLICITATION_INTERVAL "router-solicitation-interval" #define NM_NDISC_ROUTER_SOLICITATION_INTERVAL "router-solicitation-interval"
#define NM_NDISC_CONFIG_RECEIVED "config-received" #define NM_NDISC_CONFIG_RECEIVED "config-received"
#define NM_NDISC_RA_TIMEOUT "ra-timeout" #define NM_NDISC_RA_TIMEOUT_SIGNAL "ra-timeout-signal"
typedef enum { typedef enum {
NM_NDISC_DHCP_LEVEL_UNKNOWN, NM_NDISC_DHCP_LEVEL_UNKNOWN,

2
src/nm-iface-helper.c
View file

@ -573,7 +573,7 @@ main (int argc, char *argv[])
G_CALLBACK (ndisc_config_changed), G_CALLBACK (ndisc_config_changed),
NULL); NULL);
g_signal_connect (ndisc, g_signal_connect (ndisc,
NM_NDISC_RA_TIMEOUT, NM_NDISC_RA_TIMEOUT_SIGNAL,
G_CALLBACK (ndisc_ra_timeout), G_CALLBACK (ndisc_ra_timeout),
NULL); NULL);
nm_ndisc_start (ndisc); nm_ndisc_start (ndisc);