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

libnm: implement nm_remote_connection_delete()/nm_remote_connection_delete_async() by using GDBusConnection directly

Browse source
This commit is contained in:
Thomas Haller 2019-10-06 17:13:33 +02:00
parent dd94a8c0a9
commit fb3d91db30
1 changed files with 27 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
libnm/nm-remote-connection.c
View file

@ -363,34 +363,18 @@ nm_remote_connection_delete (NMRemoteConnection *connection,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
NMRemoteConnectionPrivate *priv;
gboolean ret;
g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE);
priv = NM_REMOTE_CONNECTION_GET_PRIVATE (connection); return _nm_object_dbus_call_sync_void (connection,
cancellable,
ret = nmdbus_settings_connection_call_delete_sync (priv->proxy, cancellable, error); g_dbus_proxy_get_object_path (G_DBUS_PROXY (NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->proxy)),
if (error && *error) NM_DBUS_INTERFACE_SETTINGS_CONNECTION,
g_dbus_error_strip_remote_error (*error); "Delete",
return ret; g_variant_new ("()"),
} G_DBUS_CALL_FLAGS_NONE,
NM_DBUS_DEFAULT_TIMEOUT_MSEC,
static void TRUE,
delete_cb (GObject *proxy, GAsyncResult *result, gpointer user_data) error);
{
GSimpleAsyncResult *simple = user_data;
GError *error = NULL;
if (nmdbus_settings_connection_call_delete_finish (NMDBUS_SETTINGS_CONNECTION (proxy),
result, &error))
g_simple_async_result_set_op_res_gboolean (simple, TRUE);
else {
g_dbus_error_strip_remote_error (error);
g_simple_async_result_take_error (simple, error);
}
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
/** /**
@ -408,18 +392,22 @@ nm_remote_connection_delete_async (NMRemoteConnection *connection,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
NMRemoteConnectionPrivate *priv;
GSimpleAsyncResult *simple;
g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
priv = NM_REMOTE_CONNECTION_GET_PRIVATE (connection); _nm_object_dbus_call (connection,
nm_remote_connection_delete_async,
simple = g_simple_async_result_new (G_OBJECT (connection), callback, user_data, cancellable,
nm_remote_connection_delete_async); callback,
if (cancellable) user_data,
g_simple_async_result_set_check_cancellable (simple, cancellable); g_dbus_proxy_get_object_path (G_DBUS_PROXY (NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->proxy)),
nmdbus_settings_connection_call_delete (priv->proxy, cancellable, delete_cb, simple); NM_DBUS_INTERFACE_SETTINGS_CONNECTION,
"Delete",
g_variant_new ("()"),
G_VARIANT_TYPE ("()"),
G_DBUS_CALL_FLAGS_NONE,
NM_DBUS_DEFAULT_TIMEOUT_MSEC,
nm_dbus_connection_call_finish_void_strip_dbus_error_cb);
} }
/** /**
@ -437,15 +425,10 @@ nm_remote_connection_delete_finish (NMRemoteConnection *connection,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
GSimpleAsyncResult *simple; g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE);
g_return_val_if_fail (nm_g_task_is_valid (result, connection, nm_remote_connection_delete_async), FALSE);
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (connection), nm_remote_connection_delete_async), FALSE); return g_task_propagate_boolean (G_TASK (result), error);
simple = G_SIMPLE_ASYNC_RESULT (result);
if (g_simple_async_result_propagate_error (simple, error))
return FALSE;
else
return g_simple_async_result_get_op_res_gboolean (simple);
} }
/** /**