diff options
author | Thomas Haller <thaller@redhat.com> | 2016-04-04 16:03:13 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-04-04 16:48:10 +0200 |
commit | f7729751da08a3a22eff457ac6e8383ac2752f5c (patch) | |
tree | b677701334934720b7c79accb3ab37134b457b47 | |
parent | 1ddc2c59b8c0afff70ad0a375b32042127029fcf (diff) | |
download | NetworkManager-f7729751da08a3a22eff457ac6e8383ac2752f5c.tar.gz |
core: use defines for signal names in NMDnsManager and NMFirewallManager
-rw-r--r-- | src/dns-manager/nm-dns-manager.c | 14 | ||||
-rw-r--r-- | src/dns-manager/nm-dns-manager.h | 2 | ||||
-rw-r--r-- | src/nm-firewall-manager.c | 2 | ||||
-rw-r--r-- | src/nm-firewall-manager.h | 2 | ||||
-rw-r--r-- | src/nm-policy.c | 4 |
5 files changed, 14 insertions, 10 deletions
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 33572b4065..b42af167cd 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -1599,12 +1599,12 @@ nm_dns_manager_class_init (NMDnsManagerClass *klass) /* signals */ signals[CONFIG_CHANGED] = - g_signal_new ("config-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDnsManagerClass, config_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new (NM_DNS_MANAGER_CONFIG_CHANGED, + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDnsManagerClass, config_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h index dd5c9e9879..f1293f7ebb 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns-manager/nm-dns-manager.h @@ -43,6 +43,8 @@ G_BEGIN_DECLS #define NM_IS_DNS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_DNS_MANAGER)) #define NM_DNS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_DNS_MANAGER, NMDnsManagerClass)) +#define NM_DNS_MANAGER_CONFIG_CHANGED "config-changed" + typedef struct { GObject parent; } NMDnsManager; diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 7babff3ce0..f1d0170b03 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -520,7 +520,7 @@ nm_firewall_manager_class_init (NMFirewallManagerClass *klass) G_PARAM_STATIC_STRINGS)); signals[STARTED] = - g_signal_new ("started", + g_signal_new (NM_FIREWALL_MANAGER_STARTED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMFirewallManagerClass, started), diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h index dfa83b459e..a08ac8b843 100644 --- a/src/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h @@ -40,6 +40,8 @@ G_BEGIN_DECLS #define NM_FIREWALL_MANAGER_AVAILABLE "available" +#define NM_FIREWALL_MANAGER_STARTED "started" + struct _NMFirewallManagerCallId; typedef struct _NMFirewallManagerCallId *NMFirewallManagerCallId; diff --git a/src/nm-policy.c b/src/nm-policy.c index 79f94927cd..07bcce89ec 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1856,12 +1856,12 @@ constructed (GObject *object) priv->firewall_manager = g_object_ref (nm_firewall_manager_get ()); - priv->fw_started_id = g_signal_connect (priv->firewall_manager, "started", + priv->fw_started_id = g_signal_connect (priv->firewall_manager, NM_FIREWALL_MANAGER_STARTED, G_CALLBACK (firewall_started), self); priv->dns_manager = g_object_ref (nm_dns_manager_get ()); nm_dns_manager_set_initial_hostname (priv->dns_manager, priv->orig_hostname); - priv->config_changed_id = g_signal_connect (priv->dns_manager, "config-changed", + priv->config_changed_id = g_signal_connect (priv->dns_manager, NM_DNS_MANAGER_CONFIG_CHANGED, G_CALLBACK (dns_config_changed), self); priv->resolver = g_resolver_get_default (); |