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

libnm/secret-agent: use GTask for nm_secret_agent_old_register*()

Browse source 
This change is of course right and read nicer. Also, the GTask captures the
current g_main_context_get_thread_default(). We will need that next.

(cherry picked from commit cff4e937ac)
This commit is contained in:
Thomas Haller 2019-12-16 16:06:18 +01:00
parent eeb3a25ca2
commit 37f1c52fa9
1 changed files with 31 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
libnm/nm-secret-agent-old.c
View file

@ -540,35 +540,27 @@ reg_with_caps_cb (GObject *proxy,
GAsyncResult *result, GAsyncResult *result,
gpointer user_data) gpointer user_data)
{ {
_nm_unused gs_unref_object GSimpleAsyncResult *simple = user_data; gs_unref_object GTask *task = user_data;
NMSecretAgentOld *self; NMSecretAgentOld *self = g_task_get_source_object (task);
NMSecretAgentOldPrivate *priv; NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
gs_free_error GError *error = NULL; gs_free_error GError *error = NULL;
self = NM_SECRET_AGENT_OLD (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
g_object_unref (self); /* drop extra ref added by get_source_object() */
priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
if (!nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error)) if (!nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error))
g_dbus_error_strip_remote_error (error); g_dbus_error_strip_remote_error (error);
priv->registering = FALSE; priv->registering = FALSE;
if (error) { if (error) {
g_simple_async_result_take_error (simple, g_steal_pointer (&error));
g_simple_async_result_complete (simple);
/* If registration failed we shouldn't expose ourselves on the bus */ /* If registration failed we shouldn't expose ourselves on the bus */
_internal_unregister (self); _internal_unregister (self);
g_task_return_error (task, g_steal_pointer (&error));
return; return;
} }
priv->registered = TRUE; priv->registered = TRUE;
_notify (self, PROP_REGISTERED); _notify (self, PROP_REGISTERED);
g_simple_async_result_set_op_res_gboolean (simple, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete (simple);
} }
/** /**
@ -593,8 +585,8 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
{ {
NMSecretAgentOldPrivate *priv; NMSecretAgentOldPrivate *priv;
NMSecretAgentOldClass *class; NMSecretAgentOldClass *class;
gs_unref_object GSimpleAsyncResult *simple = NULL; gs_unref_object GTask *task = NULL;
GError *error = NULL; gs_free_error GError *error = NULL;
g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self)); g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self));
@ -611,14 +603,10 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
g_return_if_fail (class->save_secrets != NULL); g_return_if_fail (class->save_secrets != NULL);
g_return_if_fail (class->delete_secrets != NULL); g_return_if_fail (class->delete_secrets != NULL);
simple = g_simple_async_result_new (G_OBJECT (self), callback, user_data, task = nm_g_task_new (self, cancellable, nm_secret_agent_old_register_async, callback, user_data);
nm_secret_agent_old_register_async);
if (cancellable)
g_simple_async_result_set_check_cancellable (simple, cancellable);
if (!check_nm_running (self, &error)) { if (!check_nm_running (self, &error)) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, g_steal_pointer (&error));
g_simple_async_result_complete_in_idle (simple);
return; return;
} }
@ -627,8 +615,7 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
priv->bus, priv->bus,
NM_DBUS_PATH_SECRET_AGENT, NM_DBUS_PATH_SECRET_AGENT,
&error)) { &error)) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, g_steal_pointer (&error));
g_simple_async_result_complete_in_idle (simple);
return; return;
} }
@ -640,7 +627,7 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
priv->capabilities, priv->capabilities,
NULL, NULL,
reg_with_caps_cb, reg_with_caps_cb,
g_steal_pointer (&simple)); g_steal_pointer (&task));
} }
/** /**
@ -658,12 +645,10 @@ nm_secret_agent_old_register_finish (NMSecretAgentOld *self,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), nm_secret_agent_old_register_async), FALSE); g_return_val_if_fail (NM_IS_SECRET_AGENT_OLD (self), FALSE);
g_return_val_if_fail (nm_g_task_is_valid (result, self, nm_secret_agent_old_register_async), FALSE);
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) return g_task_propagate_boolean (G_TASK (result), error);
return FALSE;
else
return TRUE;
} }
/** /**
@ -706,24 +691,21 @@ nm_secret_agent_old_unregister (NMSecretAgentOld *self,
static void static void
unregister_cb (GObject *proxy, GAsyncResult *result, gpointer user_data) unregister_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
{ {
gs_unref_object GSimpleAsyncResult *simple = user_data; gs_unref_object GTask *task = user_data;
NMSecretAgentOld *self; NMSecretAgentOld *self = g_task_get_source_object (task);
GError *error = NULL; gs_free_error GError *error = NULL;
self = NM_SECRET_AGENT_OLD (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
g_object_unref (self); /* drop extra ref added by get_source_object() */
_internal_unregister (self); _internal_unregister (self);
if (nmdbus_agent_manager_call_unregister_finish (NMDBUS_AGENT_MANAGER (proxy), if (!nmdbus_agent_manager_call_unregister_finish (NMDBUS_AGENT_MANAGER (proxy),
result, &error)) result,
g_simple_async_result_set_op_res_gboolean (simple, TRUE); &error)) {
else {
g_dbus_error_strip_remote_error (error); g_dbus_error_strip_remote_error (error);
g_simple_async_result_take_error (simple, error); g_task_return_error (task, g_steal_pointer (&error));
return;
} }
g_simple_async_result_complete (simple); g_task_return_boolean (task, TRUE);
} }
/** /**
@ -744,8 +726,8 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
gpointer user_data) gpointer user_data)
{ {
NMSecretAgentOldPrivate *priv; NMSecretAgentOldPrivate *priv;
gs_unref_object GSimpleAsyncResult *simple = NULL; gs_unref_object GTask *task = NULL;
GError *error = NULL; gs_free_error GError *error = NULL;
g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self)); g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self));
@ -754,14 +736,10 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
g_return_if_fail (priv->bus != NULL); g_return_if_fail (priv->bus != NULL);
g_return_if_fail (priv->manager_proxy != NULL); g_return_if_fail (priv->manager_proxy != NULL);
simple = g_simple_async_result_new (G_OBJECT (self), callback, user_data, task = nm_g_task_new (self, cancellable, nm_secret_agent_old_unregister_async, callback, user_data);
nm_secret_agent_old_unregister_async);
if (cancellable)
g_simple_async_result_set_check_cancellable (simple, cancellable);
if (!check_nm_running (self, &error)) { if (!check_nm_running (self, &error)) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, g_steal_pointer (&error));
g_simple_async_result_complete_in_idle (simple);
return; return;
} }
@ -770,7 +748,7 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
nmdbus_agent_manager_call_unregister (priv->manager_proxy, nmdbus_agent_manager_call_unregister (priv->manager_proxy,
cancellable, cancellable,
unregister_cb, unregister_cb,
g_steal_pointer (&simple)); g_steal_pointer (&task));
} }
/** /**
@ -788,12 +766,10 @@ nm_secret_agent_old_unregister_finish (NMSecretAgentOld *self,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), nm_secret_agent_old_unregister_async), FALSE); g_return_val_if_fail (NM_IS_SECRET_AGENT_OLD (self), FALSE);
g_return_val_if_fail (nm_g_task_is_valid (result, self, nm_secret_agent_old_unregister_async), FALSE);
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) return g_task_propagate_boolean (G_TASK (result), error);
return FALSE;
else
return TRUE;
} }
/** /**