diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-01-14 16:36:33 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-01-16 17:24:36 +0100 |
| commit | 175ef8f611888c23736d0d593e1512ac2770ea48 (patch) | |
| tree | 6734c072869df892eae980fbfc3229d929ddda4f /src/devices | |
| parent | f8227029fef7ad31e92ac561bbe77453fbef5675 (diff) | |
| download | NetworkManager-175ef8f611888c23736d0d593e1512ac2770ea48.tar.gz | |
ppp: use defines for signal names
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.c | 4 | ||||
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 4 | ||||
| -rw-r--r-- | src/devices/nm-device-macvlan.c | 2 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 8 |
4 files changed, 9 insertions, 9 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); |