diff options
Diffstat (limited to 'src/dhcp-manager/nm-dhcp-listener.c')
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-listener.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index 25f09ff6c7..f6fafb8082 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -39,8 +39,8 @@ typedef struct { NMBusManager * dbus_mgr; - guint new_conn_id; - guint dis_conn_id; + gulong new_conn_id; + gulong dis_conn_id; GHashTable * signal_handlers; } NMDhcpListenerPrivate; @@ -211,14 +211,8 @@ dispose (GObject *object) { NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE (object); - if (priv->new_conn_id) { - g_signal_handler_disconnect (priv->dbus_mgr, priv->new_conn_id); - priv->new_conn_id = 0; - } - if (priv->dis_conn_id) { - g_signal_handler_disconnect (priv->dbus_mgr, priv->dis_conn_id); - priv->dis_conn_id = 0; - } + nm_clear_g_signal_handler (priv->dbus_mgr, &priv->new_conn_id); + nm_clear_g_signal_handler (priv->dbus_mgr, &priv->dis_conn_id); priv->dbus_mgr = NULL; g_clear_pointer (&priv->signal_handlers, g_hash_table_destroy); |