From 175ef8f611888c23736d0d593e1512ac2770ea48 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 14 Jan 2017 16:36:33 +0100 Subject: [PATCH] ppp: use defines for signal names --- src/devices/adsl/nm-device-adsl.c | 4 ++-- src/devices/nm-device-ethernet.c | 4 ++-- src/devices/nm-device-macvlan.c | 2 +- src/devices/wwan/nm-modem.c | 8 ++++---- src/ppp/nm-ppp-manager.c | 8 ++++---- src/ppp/nm-ppp-manager.h | 6 +++++- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index 9af6e69035..82974be31c 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -482,10 +482,10 @@ act_stage3_ip4_config_start (NMDevice *device, && nm_ppp_manager_start (priv->ppp_manager, req, nm_setting_adsl_get_username (s_adsl), 30, 0, &err)) { - g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_STATE_CHANGED, + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_STATE_CHANGED, G_CALLBACK (ppp_state_changed), self); - g_signal_connect (priv->ppp_manager, "ip4-config", + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_IP4_CONFIG, G_CALLBACK (ppp_ip4_config), self); ret = NM_ACT_STAGE_RETURN_POSTPONE; diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 07f60d05b8..8de4e3bcb5 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1055,10 +1055,10 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas && nm_ppp_manager_start (priv->ppp_manager, req, nm_setting_pppoe_get_username (s_pppoe), 30, 0, &err)) { - g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_STATE_CHANGED, + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_STATE_CHANGED, G_CALLBACK (ppp_state_changed), self); - g_signal_connect (priv->ppp_manager, "ip4-config", + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_IP4_CONFIG, G_CALLBACK (ppp_ip4_config), self); ret = NM_ACT_STAGE_RETURN_POSTPONE; diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 9d3c3c370b..6f9879c558 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -156,7 +156,7 @@ parent_changed_notify (NMDevice *device, if (new_parent) { priv->parent_state_id = g_signal_connect (new_parent, - "state-changed", + NM_DEVICE_STATE_CHANGED, G_CALLBACK (parent_state_changed), device); diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 4a8e9094ad..04c95a2bed 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -563,16 +563,16 @@ ppp_stage3_ip_config_start (NMModem *self, if ( priv->ppp_manager && nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, ip_timeout, baud_override, &error)) { - g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_STATE_CHANGED, + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_STATE_CHANGED, G_CALLBACK (ppp_state_changed), self); - g_signal_connect (priv->ppp_manager, "ip4-config", + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_IP4_CONFIG, G_CALLBACK (ppp_ip4_config), self); - g_signal_connect (priv->ppp_manager, "ip6-config", + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_IP6_CONFIG, G_CALLBACK (ppp_ip6_config), self); - g_signal_connect (priv->ppp_manager, "stats", + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_SIGNAL_STATS, G_CALLBACK (ppp_stats), self); diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index cc7451c97b..1bbe29d46b 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -1243,7 +1243,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); signals[STATE_CHANGED] = - g_signal_new (NM_PPP_MANAGER_STATE_CHANGED, + g_signal_new (NM_PPP_MANAGER_SIGNAL_STATE_CHANGED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, @@ -1252,7 +1252,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) G_TYPE_UINT); signals[IP4_CONFIG] = - g_signal_new ("ip4-config", + g_signal_new (NM_PPP_MANAGER_SIGNAL_IP4_CONFIG, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, @@ -1262,7 +1262,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) G_TYPE_OBJECT); signals[IP6_CONFIG] = - g_signal_new ("ip6-config", + g_signal_new (NM_PPP_MANAGER_SIGNAL_IP6_CONFIG, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, @@ -1270,7 +1270,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_OBJECT); signals[STATS] = - g_signal_new ("stats", + g_signal_new (NM_PPP_MANAGER_SIGNAL_STATS, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, 0, diff --git a/src/ppp/nm-ppp-manager.h b/src/ppp/nm-ppp-manager.h index a86fe26ae5..b1a7bb609a 100644 --- a/src/ppp/nm-ppp-manager.h +++ b/src/ppp/nm-ppp-manager.h @@ -23,7 +23,11 @@ #define __NM_PPP_MANAGER_H__ #define NM_PPP_MANAGER_PARENT_IFACE "parent-iface" -#define NM_PPP_MANAGER_STATE_CHANGED "state-changed" + +#define NM_PPP_MANAGER_SIGNAL_STATE_CHANGED "state-changed" +#define NM_PPP_MANAGER_SIGNAL_IP4_CONFIG "ip4-config" +#define NM_PPP_MANAGER_SIGNAL_IP6_CONFIG "ip6-config" +#define NM_PPP_MANAGER_SIGNAL_STATS "stats" typedef struct _NMPPPManager NMPPPManager;