diff options
| author | Michael Biebl <biebl@debian.org> | 2020-10-05 22:27:18 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-10-05 22:27:18 +0200 |
| commit | aafc1dbe4712c86189bbc1d4d54ad8cb4c69be7e (patch) | |
| tree | a2a9bb4d007339a0b1304540388230ccedac32bd /libnm/nm-remote-connection.c | |
| parent | e7b44ef4c80907346ec7492a09c45277459924fc (diff) | |
New upstream version 1.27.90 upstream/1.27.90
Diffstat (limited to 'libnm/nm-remote-connection.c')
| -rw-r--r-- | libnm/nm-remote-connection.c | 902 |
1 files changed, 447 insertions, 455 deletions
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index b37f5814..63ffbf1a 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2011 Red Hat, Inc. @@ -27,40 +27,42 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE (NMRemoteConnection, - PROP_UNSAVED, - PROP_FLAGS, - PROP_FILENAME, - PROP_VISIBLE, -); +NM_GOBJECT_PROPERTIES_DEFINE(NMRemoteConnection, + PROP_UNSAVED, + PROP_FLAGS, + PROP_FILENAME, + PROP_VISIBLE, ); typedef struct { - GCancellable *get_settings_cancellable; + GCancellable *get_settings_cancellable; - char *filename; - guint32 flags; - bool unsaved; + char * filename; + guint32 flags; + bool unsaved; - bool visible:1; - bool is_initialized:1; + bool visible : 1; + bool is_initialized : 1; } NMRemoteConnectionPrivate; struct _NMRemoteConnection { - NMObject parent; - NMRemoteConnectionPrivate _priv; + NMObject parent; + NMRemoteConnectionPrivate _priv; }; struct _NMRemoteConnectionClass { - NMObjectClass parent_class; + NMObjectClass parent_class; }; -static void nm_remote_connection_connection_iface_init (NMConnectionInterface *iface); +static void nm_remote_connection_connection_iface_init(NMConnectionInterface *iface); -G_DEFINE_TYPE_WITH_CODE (NMRemoteConnection, nm_remote_connection, NM_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (NM_TYPE_CONNECTION, nm_remote_connection_connection_iface_init); - ) +G_DEFINE_TYPE_WITH_CODE(NMRemoteConnection, + nm_remote_connection, + NM_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE(NM_TYPE_CONNECTION, + nm_remote_connection_connection_iface_init);) -#define NM_REMOTE_CONNECTION_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMRemoteConnection, NM_IS_REMOTE_CONNECTION, NMObject) +#define NM_REMOTE_CONNECTION_GET_PRIVATE(self) \ + _NM_GET_PRIVATE(self, NMRemoteConnection, NM_IS_REMOTE_CONNECTION, NMObject) /*****************************************************************************/ @@ -79,41 +81,38 @@ G_DEFINE_TYPE_WITH_CODE (NMRemoteConnection, nm_remote_connection, NM_TYPE_OBJEC * Since: 1.12 **/ void -nm_remote_connection_update2 (NMRemoteConnection *connection, - GVariant *settings, - NMSettingsUpdate2Flags flags, - GVariant *args, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +nm_remote_connection_update2(NMRemoteConnection * connection, + GVariant * settings, + NMSettingsUpdate2Flags flags, + GVariant * args, + GCancellable * cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); - g_return_if_fail (!settings || g_variant_is_of_type (settings, NM_VARIANT_TYPE_CONNECTION)); - g_return_if_fail (!args || g_variant_is_of_type (args, G_VARIANT_TYPE ("a{sv}"))); - g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); - - if (!settings) - settings = g_variant_new_array (G_VARIANT_TYPE ("{sa{sv}}"), NULL, 0); - if (!args) - args = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0); - - _nm_client_dbus_call (_nm_object_get_client (connection), - connection, - nm_remote_connection_update2, - cancellable, - callback, - user_data, - _nm_object_get_path (connection), - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - "Update2", - g_variant_new ("(@a{sa{sv}}u@a{sv})", - settings, - (guint32) flags, - args), - G_VARIANT_TYPE ("(a{sv})"), - G_DBUS_CALL_FLAGS_NONE, - NM_DBUS_DEFAULT_TIMEOUT_MSEC, - nm_dbus_connection_call_finish_variant_strip_dbus_error_cb); + g_return_if_fail(NM_IS_REMOTE_CONNECTION(connection)); + g_return_if_fail(!settings || g_variant_is_of_type(settings, NM_VARIANT_TYPE_CONNECTION)); + g_return_if_fail(!args || g_variant_is_of_type(args, G_VARIANT_TYPE("a{sv}"))); + g_return_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable)); + + if (!settings) + settings = g_variant_new_array(G_VARIANT_TYPE("{sa{sv}}"), NULL, 0); + if (!args) + args = g_variant_new_array(G_VARIANT_TYPE("{sv}"), NULL, 0); + + _nm_client_dbus_call(_nm_object_get_client(connection), + connection, + nm_remote_connection_update2, + cancellable, + callback, + user_data, + _nm_object_get_path(connection), + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + "Update2", + g_variant_new("(@a{sa{sv}}u@a{sv})", settings, (guint32) flags, args), + G_VARIANT_TYPE("(a{sv})"), + G_DBUS_CALL_FLAGS_NONE, + NM_DBUS_DEFAULT_TIMEOUT_MSEC, + nm_dbus_connection_call_finish_variant_strip_dbus_error_cb); } /** @@ -128,25 +127,24 @@ nm_remote_connection_update2 (NMRemoteConnection *connection, * %NULL. **/ GVariant * -nm_remote_connection_update2_finish (NMRemoteConnection *connection, - GAsyncResult *result, - GError **error) +nm_remote_connection_update2_finish(NMRemoteConnection *connection, + GAsyncResult * result, + GError ** error) { - gs_unref_variant GVariant *ret = NULL; - GVariant *v_result; + gs_unref_variant GVariant *ret = NULL; + GVariant * v_result; - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), NULL); - g_return_val_if_fail (nm_g_task_is_valid (result, connection, nm_remote_connection_update2), NULL); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), NULL); + g_return_val_if_fail(nm_g_task_is_valid(result, connection, nm_remote_connection_update2), + NULL); - ret = g_task_propagate_pointer (G_TASK (result), error); - if (!ret) - return NULL; + ret = g_task_propagate_pointer(G_TASK(result), error); + if (!ret) + return NULL; - g_variant_get (ret, - "(@a{sv})", - &v_result); + g_variant_get(ret, "(@a{sv})", &v_result); - return v_result; + return v_result; } /*****************************************************************************/ @@ -167,37 +165,36 @@ nm_remote_connection_update2_finish (NMRemoteConnection *connection, * Deprecated: 1.22: Use nm_remote_connection_commit_changes_async() or GDBusConnection. **/ gboolean -nm_remote_connection_commit_changes (NMRemoteConnection *connection, - gboolean save_to_disk, - GCancellable *cancellable, - GError **error) +nm_remote_connection_commit_changes(NMRemoteConnection *connection, + gboolean save_to_disk, + GCancellable * cancellable, + GError ** error) { - gs_unref_variant GVariant *ret = NULL; - - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); - g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), FALSE); - - ret = _nm_client_dbus_call_sync (_nm_object_get_client (connection), - cancellable, - _nm_object_get_path (connection), - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - "Update2", - g_variant_new ("(@a{sa{sv}}u@a{sv})", - nm_connection_to_dbus (NM_CONNECTION (connection), - NM_CONNECTION_SERIALIZE_ALL), - (guint32) ( save_to_disk - ? NM_SETTINGS_UPDATE2_FLAG_TO_DISK - : NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY), - g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0)), - G_VARIANT_TYPE ("(a{sv})"), - G_DBUS_CALL_FLAGS_NONE, - NM_DBUS_DEFAULT_TIMEOUT_MSEC, - TRUE, - error); - if (!ret) - return FALSE; - - return TRUE; + gs_unref_variant GVariant *ret = NULL; + + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), FALSE); + g_return_val_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable), FALSE); + + ret = _nm_client_dbus_call_sync( + _nm_object_get_client(connection), + cancellable, + _nm_object_get_path(connection), + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + "Update2", + g_variant_new("(@a{sa{sv}}u@a{sv})", + nm_connection_to_dbus(NM_CONNECTION(connection), NM_CONNECTION_SERIALIZE_ALL), + (guint32)(save_to_disk ? NM_SETTINGS_UPDATE2_FLAG_TO_DISK + : NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY), + g_variant_new_array(G_VARIANT_TYPE("{sv}"), NULL, 0)), + G_VARIANT_TYPE("(a{sv})"), + G_DBUS_CALL_FLAGS_NONE, + NM_DBUS_DEFAULT_TIMEOUT_MSEC, + TRUE, + error); + if (!ret) + return FALSE; + + return TRUE; } /** @@ -214,25 +211,23 @@ nm_remote_connection_commit_changes (NMRemoteConnection *connection, * changed. **/ void -nm_remote_connection_commit_changes_async (NMRemoteConnection *connection, - gboolean save_to_disk, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +nm_remote_connection_commit_changes_async(NMRemoteConnection *connection, + gboolean save_to_disk, + GCancellable * cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); - g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); - - nm_remote_connection_update2 (connection, - nm_connection_to_dbus (NM_CONNECTION (connection), - NM_CONNECTION_SERIALIZE_ALL), - save_to_disk - ? NM_SETTINGS_UPDATE2_FLAG_TO_DISK - : NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY, - NULL, - cancellable, - callback, - user_data); + g_return_if_fail(NM_IS_REMOTE_CONNECTION(connection)); + g_return_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable)); + + nm_remote_connection_update2( + connection, + nm_connection_to_dbus(NM_CONNECTION(connection), NM_CONNECTION_SERIALIZE_ALL), + save_to_disk ? NM_SETTINGS_UPDATE2_FLAG_TO_DISK : NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY, + NULL, + cancellable, + callback, + user_data); } /** @@ -246,14 +241,14 @@ nm_remote_connection_commit_changes_async (NMRemoteConnection *connection, * Returns: %TRUE on success, %FALSE on error, in which case @error will be set. **/ gboolean -nm_remote_connection_commit_changes_finish (NMRemoteConnection *connection, - GAsyncResult *result, - GError **error) +nm_remote_connection_commit_changes_finish(NMRemoteConnection *connection, + GAsyncResult * result, + GError ** error) { - gs_unref_variant GVariant *v_result = NULL; + gs_unref_variant GVariant *v_result = NULL; - v_result = nm_remote_connection_update2_finish (connection, result, error); - return !!v_result; + v_result = nm_remote_connection_update2_finish(connection, result, error); + return !!v_result; } /*****************************************************************************/ @@ -272,23 +267,21 @@ nm_remote_connection_commit_changes_finish (NMRemoteConnection *connection, * Deprecated: 1.22: Use nm_remote_connection_save_async() or GDBusConnection. **/ gboolean -nm_remote_connection_save (NMRemoteConnection *connection, - GCancellable *cancellable, - GError **error) +nm_remote_connection_save(NMRemoteConnection *connection, GCancellable *cancellable, GError **error) { - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); - g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), FALSE); - - return _nm_client_dbus_call_sync_void (_nm_object_get_client (connection), - cancellable, - _nm_object_get_path (connection), - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - "Save", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - NM_DBUS_DEFAULT_TIMEOUT_MSEC, - TRUE, - error); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), FALSE); + g_return_val_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable), FALSE); + + return _nm_client_dbus_call_sync_void(_nm_object_get_client(connection), + cancellable, + _nm_object_get_path(connection), + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + "Save", + g_variant_new("()"), + G_DBUS_CALL_FLAGS_NONE, + NM_DBUS_DEFAULT_TIMEOUT_MSEC, + TRUE, + error); } /** @@ -302,28 +295,28 @@ nm_remote_connection_save (NMRemoteConnection *connection, * been written to disk, or if the connection has never been saved. **/ void -nm_remote_connection_save_async (NMRemoteConnection *connection, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +nm_remote_connection_save_async(NMRemoteConnection *connection, + GCancellable * cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); - g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); - - _nm_client_dbus_call (_nm_object_get_client (connection), - connection, - nm_remote_connection_save_async, - cancellable, - callback, - user_data, - _nm_object_get_path (connection), - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - "Save", - 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); + g_return_if_fail(NM_IS_REMOTE_CONNECTION(connection)); + g_return_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable)); + + _nm_client_dbus_call(_nm_object_get_client(connection), + connection, + nm_remote_connection_save_async, + cancellable, + callback, + user_data, + _nm_object_get_path(connection), + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + "Save", + 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); } /** @@ -337,14 +330,15 @@ nm_remote_connection_save_async (NMRemoteConnection *connection, * Returns: %TRUE on success, %FALSE on error, in which case @error will be set. **/ gboolean -nm_remote_connection_save_finish (NMRemoteConnection *connection, - GAsyncResult *result, - GError **error) +nm_remote_connection_save_finish(NMRemoteConnection *connection, + GAsyncResult * result, + GError ** error) { - 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_save_async), FALSE); + 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_save_async), + FALSE); - return g_task_propagate_boolean (G_TASK (result), error); + return g_task_propagate_boolean(G_TASK(result), error); } /*****************************************************************************/ @@ -362,22 +356,22 @@ nm_remote_connection_save_finish (NMRemoteConnection *connection, * Deprecated: 1.22: Use nm_remote_connection_delete_async() or GDBusConnection. **/ gboolean -nm_remote_connection_delete (NMRemoteConnection *connection, - GCancellable *cancellable, - GError **error) +nm_remote_connection_delete(NMRemoteConnection *connection, + GCancellable * cancellable, + GError ** error) { - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); - - return _nm_client_dbus_call_sync_void (_nm_object_get_client (connection), - cancellable, - _nm_object_get_path (connection), - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - "Delete", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - NM_DBUS_DEFAULT_TIMEOUT_MSEC, - TRUE, - error); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), FALSE); + + return _nm_client_dbus_call_sync_void(_nm_object_get_client(connection), + cancellable, + _nm_object_get_path(connection), + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + "Delete", + g_variant_new("()"), + G_DBUS_CALL_FLAGS_NONE, + NM_DBUS_DEFAULT_TIMEOUT_MSEC, + TRUE, + error); } /** @@ -390,28 +384,28 @@ nm_remote_connection_delete (NMRemoteConnection *connection, * Asynchronously deletes the connection. **/ void -nm_remote_connection_delete_async (NMRemoteConnection *connection, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +nm_remote_connection_delete_async(NMRemoteConnection *connection, + GCancellable * cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); - g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); - - _nm_client_dbus_call (_nm_object_get_client (connection), - connection, - nm_remote_connection_delete_async, - cancellable, - callback, - user_data, - _nm_object_get_path (connection), - 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); + g_return_if_fail(NM_IS_REMOTE_CONNECTION(connection)); + g_return_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable)); + + _nm_client_dbus_call(_nm_object_get_client(connection), + connection, + nm_remote_connection_delete_async, + cancellable, + callback, + user_data, + _nm_object_get_path(connection), + 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); } /** @@ -425,14 +419,15 @@ nm_remote_connection_delete_async (NMRemoteConnection *connection, * Returns: %TRUE on success, %FALSE on error, in which case @error will be set. **/ gboolean -nm_remote_connection_delete_finish (NMRemoteConnection *connection, - GAsyncResult *result, - GError **error) +nm_remote_connection_delete_finish(NMRemoteConnection *connection, + GAsyncResult * result, + GError ** error) { - 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(NM_IS_REMOTE_CONNECTION(connection), FALSE); + g_return_val_if_fail(nm_g_task_is_valid(result, connection, nm_remote_connection_delete_async), + FALSE); - return g_task_propagate_boolean (G_TASK (result), error); + return g_task_propagate_boolean(G_TASK(result), error); } /** @@ -451,37 +446,35 @@ nm_remote_connection_delete_finish (NMRemoteConnection *connection, * Deprecated: 1.22: Use nm_remote_connection_get_secrets_async() or GDBusConnection. **/ GVariant * -nm_remote_connection_get_secrets (NMRemoteConnection *connection, - const char *setting_name, - GCancellable *cancellable, - GError **error) +nm_remote_connection_get_secrets(NMRemoteConnection *connection, + const char * setting_name, + GCancellable * cancellable, + GError ** error) { - gs_unref_variant GVariant *ret = NULL; - GVariant *secrets; - - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), NULL); - g_return_val_if_fail (setting_name, NULL); - g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), NULL); - - ret = _nm_client_dbus_call_sync (_nm_object_get_client (connection), - cancellable, - _nm_object_get_path (connection), - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - "GetSecrets", - g_variant_new ("(s)", setting_name), - G_VARIANT_TYPE ("(a{sa{sv}})"), - G_DBUS_CALL_FLAGS_NONE, - NM_DBUS_DEFAULT_TIMEOUT_MSEC, - TRUE, - error); - if (!ret) - return NULL; - - g_variant_get (ret, - "(@a{sa{sv}})", - &secrets); - - return secrets; + gs_unref_variant GVariant *ret = NULL; + GVariant * secrets; + + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), NULL); + g_return_val_if_fail(setting_name, NULL); + g_return_val_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable), NULL); + + ret = _nm_client_dbus_call_sync(_nm_object_get_client(connection), + cancellable, + _nm_object_get_path(connection), + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + "GetSecrets", + g_variant_new("(s)", setting_name), + G_VARIANT_TYPE("(a{sa{sv}})"), + G_DBUS_CALL_FLAGS_NONE, + NM_DBUS_DEFAULT_TIMEOUT_MSEC, + TRUE, + error); + if (!ret) + return NULL; + + g_variant_get(ret, "(@a{sa{sv}})", &secrets); + + return secrets; } /** @@ -495,30 +488,30 @@ nm_remote_connection_get_secrets (NMRemoteConnection *connection, * Asynchronously requests the connection's secrets. **/ void -nm_remote_connection_get_secrets_async (NMRemoteConnection *connection, - const char *setting_name, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +nm_remote_connection_get_secrets_async(NMRemoteConnection *connection, + const char * setting_name, + GCancellable * cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); - g_return_if_fail (setting_name); - g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); - - _nm_client_dbus_call (_nm_object_get_client (connection), - connection, - nm_remote_connection_get_secrets_async, - cancellable, - callback, - user_data, - _nm_object_get_path (connection), - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - "GetSecrets", - g_variant_new ("(s)", setting_name), - G_VARIANT_TYPE ("(a{sa{sv}})"), - G_DBUS_CALL_FLAGS_NONE, - NM_DBUS_DEFAULT_TIMEOUT_MSEC, - nm_dbus_connection_call_finish_variant_strip_dbus_error_cb); + g_return_if_fail(NM_IS_REMOTE_CONNECTION(connection)); + g_return_if_fail(setting_name); + g_return_if_fail(!cancellable || G_IS_CANCELLABLE(cancellable)); + + _nm_client_dbus_call(_nm_object_get_client(connection), + connection, + nm_remote_connection_get_secrets_async, + cancellable, + callback, + user_data, + _nm_object_get_path(connection), + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + "GetSecrets", + g_variant_new("(s)", setting_name), + G_VARIANT_TYPE("(a{sa{sv}})"), + G_DBUS_CALL_FLAGS_NONE, + NM_DBUS_DEFAULT_TIMEOUT_MSEC, + nm_dbus_connection_call_finish_variant_strip_dbus_error_cb); } /** @@ -533,25 +526,25 @@ nm_remote_connection_get_secrets_async (NMRemoteConnection *connection, * containing @connection's secrets, or %NULL on error. **/ GVariant * -nm_remote_connection_get_secrets_finish (NMRemoteConnection *connection, - GAsyncResult *result, - GError **error) +nm_remote_connection_get_secrets_finish(NMRemoteConnection *connection, + GAsyncResult * result, + GError ** error) { - gs_unref_variant GVariant *ret = NULL; - GVariant *secrets; + gs_unref_variant GVariant *ret = NULL; + GVariant * secrets; - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), NULL); - g_return_val_if_fail (nm_g_task_is_valid (result, connection, nm_remote_connection_get_secrets_async), FALSE); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), NULL); + g_return_val_if_fail( + nm_g_task_is_valid(result, connection, nm_remote_connection_get_secrets_async), + FALSE); - ret = g_task_propagate_pointer (G_TASK (result), error); - if (!ret) - return NULL; + ret = g_task_propagate_pointer(G_TASK(result), error); + if (!ret) + return NULL; - g_variant_get (ret, - "(@a{sa{sv}})", - &secrets); + g_variant_get(ret, "(@a{sa{sv}})", &secrets); - return secrets; + return secrets; } /** @@ -563,11 +556,11 @@ nm_remote_connection_get_secrets_finish (NMRemoteConnection *connection, * representation. **/ gboolean -nm_remote_connection_get_unsaved (NMRemoteConnection *connection) +nm_remote_connection_get_unsaved(NMRemoteConnection *connection) { - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), FALSE); - return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->unsaved; + return NM_REMOTE_CONNECTION_GET_PRIVATE(connection)->unsaved; } /** @@ -579,11 +572,11 @@ nm_remote_connection_get_unsaved (NMRemoteConnection *connection) * Since: 1.12 **/ NMSettingsConnectionFlags -nm_remote_connection_get_flags (NMRemoteConnection *connection) +nm_remote_connection_get_flags(NMRemoteConnection *connection) { - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), FALSE); - return (NMSettingsConnectionFlags) NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->flags; + return (NMSettingsConnectionFlags) NM_REMOTE_CONNECTION_GET_PRIVATE(connection)->flags; } /** @@ -595,11 +588,11 @@ nm_remote_connection_get_flags (NMRemoteConnection *connection) * Since: 1.12 **/ const char * -nm_remote_connection_get_filename (NMRemoteConnection *connection) +nm_remote_connection_get_filename(NMRemoteConnection *connection) { - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), NULL); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), NULL); - return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->filename; + return NM_REMOTE_CONNECTION_GET_PRIVATE(connection)->filename; } /** @@ -619,229 +612,228 @@ nm_remote_connection_get_filename (NMRemoteConnection *connection) * user, %FALSE if not. **/ gboolean -nm_remote_connection_get_visible (NMRemoteConnection *connection) +nm_remote_connection_get_visible(NMRemoteConnection *connection) { - g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), FALSE); + g_return_val_if_fail(NM_IS_REMOTE_CONNECTION(connection), FALSE); - return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->visible; + return NM_REMOTE_CONNECTION_GET_PRIVATE(connection)->visible; } /*****************************************************************************/ GCancellable * -_nm_remote_settings_get_settings_prepare (NMRemoteConnection *self) +_nm_remote_settings_get_settings_prepare(NMRemoteConnection *self) { - NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (self); + NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE(self); - nm_clear_g_cancellable (&priv->get_settings_cancellable); - priv->get_settings_cancellable = g_cancellable_new (); - return priv->get_settings_cancellable; + nm_clear_g_cancellable(&priv->get_settings_cancellable); + priv->get_settings_cancellable = g_cancellable_new(); + return priv->get_settings_cancellable; } void -_nm_remote_settings_get_settings_commit (NMRemoteConnection *self, - GVariant *settings) +_nm_remote_settings_get_settings_commit(NMRemoteConnection *self, GVariant *settings) { - NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (self); - GError *error = NULL; - gboolean visible = FALSE; - gboolean changed = FALSE; - - g_clear_object (&priv->get_settings_cancellable); - - if (!priv->is_initialized) { - changed = TRUE; - priv->is_initialized = TRUE; - } - - if (settings) { - if (!_nm_connection_replace_settings ((NMConnection *) self, - settings, - NM_SETTING_PARSE_FLAGS_BEST_EFFORT, - &error)) { - NML_NMCLIENT_LOG_E (_nm_object_get_client (self), "[%s] failure to update settings: %s", - _nm_object_get_path (self), - error->message); - g_clear_error (&error); - } else - visible = TRUE; - } else - nm_connection_clear_settings (NM_CONNECTION (self)); - - if (priv->visible != visible) { - priv->visible = visible; - _nm_client_queue_notify_object (_nm_object_get_client (self), - self, - obj_properties[PROP_VISIBLE]); - changed = TRUE; - } - - if (changed) - _nm_client_notify_object_changed (_nm_object_get_client (self), _nm_object_get_dbobj (self)); + NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE(self); + GError * error = NULL; + gboolean visible = FALSE; + gboolean changed = FALSE; + + g_clear_object(&priv->get_settings_cancellable); + + if (!priv->is_initialized) { + changed = TRUE; + priv->is_initialized = TRUE; + } + + if (settings) { + if (!_nm_connection_replace_settings((NMConnection *) self, + settings, + NM_SETTING_PARSE_FLAGS_BEST_EFFORT, + &error)) { + NML_NMCLIENT_LOG_E(_nm_object_get_client(self), + "[%s] failure to update settings: %s", + _nm_object_get_path(self), + error->message); + g_clear_error(&error); + } else + visible = TRUE; + } else + nm_connection_clear_settings(NM_CONNECTION(self)); + + if (priv->visible != visible) { + priv->visible = visible; + _nm_client_queue_notify_object(_nm_object_get_client(self), + self, + obj_properties[PROP_VISIBLE]); + changed = TRUE; + } + + if (changed) + _nm_client_notify_object_changed(_nm_object_get_client(self), _nm_object_get_dbobj(self)); } /*****************************************************************************/ static gboolean -is_ready (NMObject *nmobj) +is_ready(NMObject *nmobj) { - NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (nmobj); + NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE(nmobj); - if (!priv->is_initialized) - return FALSE;; + if (!priv->is_initialized) + return FALSE; - return NM_OBJECT_CLASS (nm_remote_connection_parent_class)->is_ready (nmobj); + return NM_OBJECT_CLASS(nm_remote_connection_parent_class)->is_ready(nmobj); } /*****************************************************************************/ static void -register_client (NMObject *nmobj, - NMClient *client, - NMLDBusObject *dbobj) +register_client(NMObject *nmobj, NMClient *client, NMLDBusObject *dbobj) { - NM_OBJECT_CLASS (nm_remote_connection_parent_class)->register_client (nmobj, client, dbobj); - nm_connection_set_path (NM_CONNECTION (nmobj), - dbobj->dbus_path->str); - _nm_client_get_settings_call (client, dbobj); + NM_OBJECT_CLASS(nm_remote_connection_parent_class)->register_client(nmobj, client, dbobj); + nm_connection_set_path(NM_CONNECTION(nmobj), dbobj->dbus_path->str); + _nm_client_get_settings_call(client, dbobj); } static void -unregister_client (NMObject *nmobj, - NMClient *client, - NMLDBusObject *dbobj) +unregister_client(NMObject *nmobj, NMClient *client, NMLDBusObject *dbobj) { - nm_clear_g_cancellable (&NM_REMOTE_CONNECTION_GET_PRIVATE (nmobj)->get_settings_cancellable); - NM_OBJECT_CLASS (nm_remote_connection_parent_class)->unregister_client (nmobj, client, dbobj); + nm_clear_g_cancellable(&NM_REMOTE_CONNECTION_GET_PRIVATE(nmobj)->get_settings_cancellable); + NM_OBJECT_CLASS(nm_remote_connection_parent_class)->unregister_client(nmobj, client, dbobj); } /*****************************************************************************/ static void -get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) +get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - switch (prop_id) { - case PROP_UNSAVED: - g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->unsaved); - break; - case PROP_FLAGS: - g_value_set_uint (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags); - break; - case PROP_FILENAME: - g_value_set_string (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->filename); - break; - case PROP_VISIBLE: - g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->visible); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + switch (prop_id) { + case PROP_UNSAVED: + g_value_set_boolean(value, NM_REMOTE_CONNECTION_GET_PRIVATE(object)->unsaved); + break; + case PROP_FLAGS: + g_value_set_uint(value, NM_REMOTE_CONNECTION_GET_PRIVATE(object)->flags); + break; + case PROP_FILENAME: + g_value_set_string(value, NM_REMOTE_CONNECTION_GET_PRIVATE(object)->filename); + break; + case PROP_VISIBLE: + g_value_set_boolean(value, NM_REMOTE_CONNECTION_GET_PRIVATE(object)->visible); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } /*****************************************************************************/ static void -nm_remote_connection_init (NMRemoteConnection *self) -{ -} +nm_remote_connection_init(NMRemoteConnection *self) +{} static void -dispose (GObject *object) +dispose(GObject *object) { - NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (object); + NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE(object); - nm_clear_g_free (&priv->filename); + nm_clear_g_free(&priv->filename); - G_OBJECT_CLASS (nm_remote_connection_parent_class)->dispose (object); + G_OBJECT_CLASS(nm_remote_connection_parent_class)->dispose(object); } -const NMLDBusMetaIface _nml_dbus_meta_iface_nm_settings_connection = NML_DBUS_META_IFACE_INIT_PROP ( - NM_DBUS_INTERFACE_SETTINGS_CONNECTION, - nm_remote_connection_get_type, - NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, - NML_DBUS_META_IFACE_DBUS_PROPERTIES ( - NML_DBUS_META_PROPERTY_INIT_S ("Filename", PROP_FILENAME, NMRemoteConnection, _priv.filename ), - NML_DBUS_META_PROPERTY_INIT_U ("Flags", PROP_FLAGS, NMRemoteConnection, _priv.flags ), - NML_DBUS_META_PROPERTY_INIT_B ("Unsaved", PROP_UNSAVED, NMRemoteConnection, _priv.unsaved ), - ), -); +const NMLDBusMetaIface _nml_dbus_meta_iface_nm_settings_connection = NML_DBUS_META_IFACE_INIT_PROP( + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, + nm_remote_connection_get_type, + NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, + NML_DBUS_META_IFACE_DBUS_PROPERTIES( + NML_DBUS_META_PROPERTY_INIT_S("Filename", + PROP_FILENAME, + NMRemoteConnection, + _priv.filename), + NML_DBUS_META_PROPERTY_INIT_U("Flags", PROP_FLAGS, NMRemoteConnection, _priv.flags), + NML_DBUS_META_PROPERTY_INIT_B("Unsaved", + PROP_UNSAVED, + NMRemoteConnection, + _priv.unsaved), ), ); static void -nm_remote_connection_class_init (NMRemoteConnectionClass *klass) +nm_remote_connection_class_init(NMRemoteConnectionClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NMObjectClass *nm_object_class = NM_OBJECT_CLASS (klass); - - object_class->get_property = get_property; - object_class->dispose = dispose; - - nm_object_class->is_ready = is_ready; - nm_object_class->register_client = register_client; - nm_object_class->unregister_client = unregister_client; - - /** - * NMRemoteConnection:unsaved: - * - * %TRUE if the remote connection contains changes that have not been saved - * to disk, %FALSE if the connection is the same as its on-disk representation. - **/ - obj_properties[PROP_UNSAVED] = - g_param_spec_boolean (NM_REMOTE_CONNECTION_UNSAVED, "", "", - FALSE, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - /** - * NMRemoteConnection:flags: - * - * The flags of the connection as unsigned integer. The values - * correspond to the #NMSettingsConnectionFlags enum. - * - * Since: 1.12 - **/ - obj_properties[PROP_FLAGS] = - g_param_spec_uint (NM_REMOTE_CONNECTION_FLAGS, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - /** - * NMRemoteConnection:filename: - * - * File that stores the connection in case the connection is - * file-backed. - * - * Since: 1.12 - **/ - obj_properties[PROP_FILENAME] = - g_param_spec_string (NM_REMOTE_CONNECTION_FILENAME, "", "", - NULL, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - /** - * NMRemoteConnection:visible: - * - * %TRUE if the remote connection is visible to the current user, %FALSE if - * not. If the connection is not visible then it is essentially useless; it - * will not contain any settings, and operations such as - * nm_remote_connection_save() and nm_remote_connection_delete() will always - * fail. (#NMRemoteSettings will not normally return non-visible connections - * to callers, but it is possible for a connection's visibility to change - * after you already have a reference to it.) - **/ - obj_properties[PROP_VISIBLE] = - g_param_spec_boolean (NM_REMOTE_CONNECTION_VISIBLE, "", "", - FALSE, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - _nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm_settings_connection); + GObjectClass * object_class = G_OBJECT_CLASS(klass); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS(klass); + + object_class->get_property = get_property; + object_class->dispose = dispose; + + nm_object_class->is_ready = is_ready; + nm_object_class->register_client = register_client; + nm_object_class->unregister_client = unregister_client; + + /** + * NMRemoteConnection:unsaved: + * + * %TRUE if the remote connection contains changes that have not been saved + * to disk, %FALSE if the connection is the same as its on-disk representation. + **/ + obj_properties[PROP_UNSAVED] = g_param_spec_boolean(NM_REMOTE_CONNECTION_UNSAVED, + "", + "", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + /** + * NMRemoteConnection:flags: + * + * The flags of the connection as unsigned integer. The values + * correspond to the #NMSettingsConnectionFlags enum. + * + * Since: 1.12 + **/ + obj_properties[PROP_FLAGS] = g_param_spec_uint(NM_REMOTE_CONNECTION_FLAGS, + "", + "", + 0, + G_MAXUINT32, + 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + /** + * NMRemoteConnection:filename: + * + * File that stores the connection in case the connection is + * file-backed. + * + * Since: 1.12 + **/ + obj_properties[PROP_FILENAME] = g_param_spec_string(NM_REMOTE_CONNECTION_FILENAME, + "", + "", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + /** + * NMRemoteConnection:visible: + * + * %TRUE if the remote connection is visible to the current user, %FALSE if + * not. If the connection is not visible then it is essentially useless; it + * will not contain any settings, and operations such as + * nm_remote_connection_save() and nm_remote_connection_delete() will always + * fail. (#NMRemoteSettings will not normally return non-visible connections + * to callers, but it is possible for a connection's visibility to change + * after you already have a reference to it.) + **/ + obj_properties[PROP_VISIBLE] = g_param_spec_boolean(NM_REMOTE_CONNECTION_VISIBLE, + "", + "", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + _nml_dbus_meta_class_init_with_properties(object_class, + &_nml_dbus_meta_iface_nm_settings_connection); } static void -nm_remote_connection_connection_iface_init (NMConnectionInterface *iface) -{ -} +nm_remote_connection_connection_iface_init(NMConnectionInterface *iface) +{} |