fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 04:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp-listener/trivial: rename field to track connections in NMDhcpListener

Browse source 
It's not "signal-handles", as it currently tracks the registration ID of
type int. Rename it, it is effectively the list of connections that we
track.

(cherry picked from commit 2dd3a5245f)
This commit is contained in:
Thomas Haller 2016-09-05 17:24:28 +02:00 • committed by Beniamino Galvani
parent b63ef470af
commit 99ec04debd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/dhcp-manager/nm-dhcp-listener.c
View file

@ -43,7 +43,7 @@ typedef struct {
NMBusManager * dbus_mgr; NMBusManager * dbus_mgr;
gulong new_conn_id; gulong new_conn_id;
gulong dis_conn_id; gulong dis_conn_id;
GHashTable * signal_handlers; GHashTable * connections;
} NMDhcpListenerPrivate; } NMDhcpListenerPrivate;
struct _NMDhcpListener { struct _NMDhcpListener {
@ -192,7 +192,7 @@ new_connection_cb (NMBusManager *mgr,
NULL, NULL,
G_DBUS_SIGNAL_FLAGS_NONE, G_DBUS_SIGNAL_FLAGS_NONE,
handle_event, self, NULL); handle_event, self, NULL);
g_hash_table_insert (priv->signal_handlers, connection, GUINT_TO_POINTER (id)); g_hash_table_insert (priv->connections, connection, GUINT_TO_POINTER (id));
} }
static void static void
@ -203,10 +203,10 @@ dis_connection_cb (NMBusManager *mgr,
NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE (self); NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE (self);
guint id; guint id;
id = GPOINTER_TO_UINT (g_hash_table_lookup (priv->signal_handlers, connection)); id = GPOINTER_TO_UINT (g_hash_table_lookup (priv->connections, connection));
if (id) { if (id) {
g_dbus_connection_signal_unsubscribe (connection, id); g_dbus_connection_signal_unsubscribe (connection, id);
g_hash_table_remove (priv->signal_handlers, connection); g_hash_table_remove (priv->connections, connection);
} }
} }
@ -218,7 +218,7 @@ nm_dhcp_listener_init (NMDhcpListener *self)
NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE (self); NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE (self);
/* Maps GDBusConnection :: signal-id */ /* Maps GDBusConnection :: signal-id */
priv->signal_handlers = g_hash_table_new (NULL, NULL); priv->connections = g_hash_table_new (NULL, NULL);
priv->dbus_mgr = nm_bus_manager_get (); priv->dbus_mgr = nm_bus_manager_get ();
@ -243,7 +243,7 @@ dispose (GObject *object)
nm_clear_g_signal_handler (priv->dbus_mgr, &priv->dis_conn_id); nm_clear_g_signal_handler (priv->dbus_mgr, &priv->dis_conn_id);
priv->dbus_mgr = NULL; priv->dbus_mgr = NULL;
g_clear_pointer (&priv->signal_handlers, g_hash_table_destroy); g_clear_pointer (&priv->connections, g_hash_table_destroy);
G_OBJECT_CLASS (nm_dhcp_listener_parent_class)->dispose (object); G_OBJECT_CLASS (nm_dhcp_listener_parent_class)->dispose (object);
} }