diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-07 19:45:34 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-07 19:53:14 +0100 |
| commit | e1738c7c6128622ad928a6bf5706b8be83e76b20 (patch) | |
| tree | 1728314f067971f6fa6938bba495263e64d0f9e3 | |
| parent | ee4ec4e60004f024e2dd82d54d39daeb64fb918c (diff) | |
| download | NetworkManager-e1738c7c6128622ad928a6bf5706b8be83e76b20.tar.gz | |
core: use define for NMDnsMasqManager's "state-changed" signal name
| -rw-r--r-- | src/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/dnsmasq-manager/nm-dnsmasq-manager.c | 16 | ||||
| -rw-r--r-- | src/dnsmasq-manager/nm-dnsmasq-manager.h | 3 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index dc23805f06..f39952984f 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6340,7 +6340,7 @@ start_sharing (NMDevice *self, NMIP4Config *config) return FALSE; } - priv->dnsmasq_state_id = g_signal_connect (priv->dnsmasq_manager, "state-changed", + priv->dnsmasq_state_id = g_signal_connect (priv->dnsmasq_manager, NM_DNS_MASQ_MANAGER_STATE_CHANGED, G_CALLBACK (dnsmasq_state_changed_cb), self); return TRUE; diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index 26318fac71..d616085c4d 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -82,14 +82,14 @@ nm_dnsmasq_manager_class_init (NMDnsMasqManagerClass *manager_class) /* signals */ signals[STATE_CHANGED] = - g_signal_new ("state-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDnsMasqManagerClass, state_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, 1, - G_TYPE_UINT); + g_signal_new (NM_DNS_MASQ_MANAGER_STATE_CHANGED, + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDnsMasqManagerClass, state_changed), + NULL, NULL, + g_cclosure_marshal_VOID__UINT, + G_TYPE_NONE, 1, + G_TYPE_UINT); } NMDnsMasqManager * diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h index f7d951b446..47c88e6ea4 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.h +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h @@ -32,6 +32,9 @@ #define NM_IS_DNSMASQ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNSMASQ_MANAGER)) #define NM_DNSMASQ_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNSMASQ_MANAGER, NMDnsMasqManagerClass)) +/* signals */ +#define NM_DNS_MASQ_MANAGER_STATE_CHANGED "state-changed" + typedef enum { NM_DNSMASQ_STATUS_UNKNOWN, |