Commit 37552090 authored by Thomas Haller's avatar Thomas Haller

core: use define for NMPPPManager's "state-changed" signal name

parent e1738c7c
...@@ -430,7 +430,7 @@ act_stage3_ip4_config_start (NMDevice *device, ...@@ -430,7 +430,7 @@ act_stage3_ip4_config_start (NMDevice *device,
priv->ppp_manager = nm_ppp_manager_new (ppp_iface); 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)) { 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), G_CALLBACK (ppp_state_changed),
self); self);
g_signal_connect (priv->ppp_manager, "ip4-config", g_signal_connect (priv->ppp_manager, "ip4-config",
......
...@@ -1004,12 +1004,12 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas ...@@ -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))); 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)) { 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_signal_connect (priv->ppp_manager, NM_PPP_MANAGER_STATE_CHANGED,
G_CALLBACK (ppp_state_changed), G_CALLBACK (ppp_state_changed),
self); self);
g_signal_connect (priv->ppp_manager, "ip4-config", g_signal_connect (priv->ppp_manager, "ip4-config",
G_CALLBACK (ppp_ip4_config), G_CALLBACK (ppp_ip4_config),
self); self);
ret = NM_ACT_STAGE_RETURN_POSTPONE; ret = NM_ACT_STAGE_RETURN_POSTPONE;
} else { } else {
_LOGW (LOGD_DEVICE, "PPPoE failed to start: %s", err->message); _LOGW (LOGD_DEVICE, "PPPoE failed to start: %s", err->message);
......
...@@ -531,7 +531,7 @@ ppp_stage3_ip_config_start (NMModem *self, ...@@ -531,7 +531,7 @@ ppp_stage3_ip_config_start (NMModem *self,
priv->ppp_manager = nm_ppp_manager_new (priv->data_port); priv->ppp_manager = nm_ppp_manager_new (priv->data_port);
if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, ip_timeout, &error)) { 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), G_CALLBACK (ppp_state_changed),
self); self);
g_signal_connect (priv->ppp_manager, "ip4-config", g_signal_connect (priv->ppp_manager, "ip4-config",
......
...@@ -602,7 +602,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) ...@@ -602,7 +602,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class)
/* signals */ /* signals */
signals[STATE_CHANGED] = signals[STATE_CHANGED] =
g_signal_new ("state-changed", g_signal_new (NM_PPP_MANAGER_STATE_CHANGED,
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMPPPManagerClass, state_changed), G_STRUCT_OFFSET (NMPPPManagerClass, state_changed),
......
...@@ -41,6 +41,9 @@ ...@@ -41,6 +41,9 @@
#define NM_PPP_MANAGER_PARENT_IFACE "parent-iface" #define NM_PPP_MANAGER_PARENT_IFACE "parent-iface"
/* signals */
#define NM_PPP_MANAGER_STATE_CHANGED "state-changed"
typedef struct { typedef struct {
NMExportedObject parent; NMExportedObject parent;
} NMPPPManager; } NMPPPManager;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment