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

agent-manager: move and inline _agent_remove_by_owner() to impl_agent_manager_unregister()

Browse source
This commit is contained in:
Thomas Haller 2019-12-23 11:32:28 +01:00
parent ed85842c36
commit 9bdf95458e
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,22 +252,6 @@ _agent_remove (NMAgentManager *self, NMSecretAgent *agent)
g_object_unref (agent);
}
static gboolean
_agent_remove_by_owner (NMAgentManager *self, const char *owner)
{
NMAgentManagerPrivate *priv = NM_AGENT_MANAGER_GET_PRIVATE (self);
NMSecretAgent *agent;
g_return_val_if_fail (owner, FALSE);
agent = _agent_find_by_owner (priv, owner);
if (!agent)
return FALSE;
_agent_remove (self, agent);
return TRUE;
}
/* Call this *after* calling request_next_agent() */
static void
maybe_remove_agent_on_error (NMAgentManager *self,
@ -482,8 +466,11 @@ impl_agent_manager_unregister (NMDBusObject *obj,
GVariant *parameters)
{
NMAgentManager *self = NM_AGENT_MANAGER (obj);
NMAgentManagerPrivate *priv = NM_AGENT_MANAGER_GET_PRIVATE (self);
NMSecretAgent *agent;
if (!_agent_remove_by_owner (self, sender)) {
agent = _agent_find_by_owner (priv, sender);
if (!agent) {
g_dbus_method_invocation_return_error_literal (invocation,
NM_AGENT_MANAGER_ERROR,
NM_AGENT_MANAGER_ERROR_NOT_REGISTERED,
@ -491,6 +478,8 @@ impl_agent_manager_unregister (NMDBusObject *obj,
return;
}
_agent_remove (self, agent);
g_dbus_method_invocation_return_value (invocation, NULL);
}