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

agent-manager: disconnect agent_disconnected_cb handler from secret-agent

Browse source 
Also, we don't need to use _agent_remove_by_owner(). We know now
the agent to be removed.
This commit is contained in:
Thomas Haller 2019-12-23 11:30:53 +01:00
parent 821efd87d8
commit ed85842c36
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/settings/nm-agent-manager.c
View file

@ -116,6 +116,8 @@ static void _con_del_request_start (Request *req);
static gboolean _con_get_try_complete_early (Request *req);
static void agent_disconnected_cb (NMSecretAgent *agent, gpointer user_data);
/*****************************************************************************/
guint64
@ -241,6 +243,8 @@ _agent_remove (NMAgentManager *self, NMSecretAgent *agent)
c_list_unlink (&agent->agent_lst);
g_signal_handlers_disconnect_by_func (agent, G_CALLBACK (agent_disconnected_cb), self);
/* Remove this agent from any in-progress secrets requests */
c_list_for_each_safe (iter, safe, &priv->request_lst_head)
request_remove_agent (c_list_entry (iter, Request, request_lst), agent);
@ -381,9 +385,7 @@ agent_register_permissions_done (NMAuthChain *chain,
static void
agent_disconnected_cb (NMSecretAgent *agent, gpointer user_data)
{
/* The agent quit, so remove it and let interested clients know */
_agent_remove_by_owner (NM_AGENT_MANAGER (user_data),
nm_secret_agent_get_dbus_owner (agent));
_agent_remove (NM_AGENT_MANAGER (user_data), agent);
}
static void