diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-07 19:47:24 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-07 19:54:11 +0100 |
| commit | 3755209039eaffb19bbe4ca1a4209e48620bd280 (patch) | |
| tree | b53649bd96cc1cdef18effa6e7e03990cdbc204f | |
| parent | e1738c7c6128622ad928a6bf5706b8be83e76b20 (diff) | |
| download | NetworkManager-3755209039eaffb19bbe4ca1a4209e48620bd280.tar.gz | |
core: use define for NMPPPManager's "state-changed" signal name
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.c | 2 | ||||
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 10 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 2 | ||||
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.c | 2 | ||||
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.h | 3 |
5 files changed, 11 insertions, 8 deletions
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index 4705b398ab..f6b565fded 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -430,7 +430,7 @@ act_stage3_ip4_config_start (NMDevice *device, priv->ppp_manager = nm_ppp_manager_new (ppp_iface); if (nm_ppp_manager_start (priv->ppp_manager, req, nm_setting_adsl_get_username (s_adsl), 30, &err)) { - g_signal_connect (priv->ppp_manager, "state-changed", + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_STATE_CHANGED, G_CALLBACK (ppp_state_changed), self); g_signal_connect (priv->ppp_manager, "ip4-config", diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 65f8716d8e..68e16f20b2 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1004,12 +1004,12 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas priv->ppp_manager = nm_ppp_manager_new (nm_device_get_iface (NM_DEVICE (self))); if (nm_ppp_manager_start (priv->ppp_manager, req, nm_setting_pppoe_get_username (s_pppoe), 30, &err)) { - g_signal_connect (priv->ppp_manager, "state-changed", - G_CALLBACK (ppp_state_changed), - self); + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_STATE_CHANGED, + G_CALLBACK (ppp_state_changed), + self); g_signal_connect (priv->ppp_manager, "ip4-config", - G_CALLBACK (ppp_ip4_config), - self); + G_CALLBACK (ppp_ip4_config), + self); ret = NM_ACT_STAGE_RETURN_POSTPONE; } else { _LOGW (LOGD_DEVICE, "PPPoE failed to start: %s", err->message); diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 86a0281b01..1510430756 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -531,7 +531,7 @@ ppp_stage3_ip_config_start (NMModem *self, priv->ppp_manager = nm_ppp_manager_new (priv->data_port); if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, ip_timeout, &error)) { - g_signal_connect (priv->ppp_manager, "state-changed", + g_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_STATE_CHANGED, G_CALLBACK (ppp_state_changed), self); g_signal_connect (priv->ppp_manager, "ip4-config", diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index ba22642df3..9cd4a1edd5 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -602,7 +602,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) /* signals */ signals[STATE_CHANGED] = - g_signal_new ("state-changed", + g_signal_new (NM_PPP_MANAGER_STATE_CHANGED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMPPPManagerClass, state_changed), diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h index 057f40982f..188be84e4c 100644 --- a/src/ppp-manager/nm-ppp-manager.h +++ b/src/ppp-manager/nm-ppp-manager.h @@ -41,6 +41,9 @@ #define NM_PPP_MANAGER_PARENT_IFACE "parent-iface" +/* signals */ +#define NM_PPP_MANAGER_STATE_CHANGED "state-changed" + typedef struct { NMExportedObject parent; } NMPPPManager; |