Commit e77acd43 authored by Giovanni Campagna's avatar Giovanni Campagna Committed by Dan Williams

libnm-glib: more GObject introspection fixes (bgo #181415)

Fix some annotations and add the necessary ones for new functions.
parent 3b57350d
......@@ -1152,8 +1152,9 @@ activate_cb (DBusGProxy *proxy,
* @client: a #NMClient
* @connection_path: the connection's DBus path
* @device: the #NMDevice
* @specific_object: the device specific object (currently used only for
* activating wireless devices and should be the #NMAccessPoint<!-- -->'s path.
* @specific_object: (allow-none): the device specific object (currently
* used only for activating wireless devices and should be the
* #NMAccessPoint<!-- -->'s path).
* @callback: (scope async): the function to call when the call is done
* @user_data: user data to pass to the callback function
*
......
......@@ -169,6 +169,8 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class)
* NMDHCP4Config:options:
*
* The #GHashTable containing options of the configuration.
*
* Type: GHashTable<utf8,GValue>
**/
g_object_class_install_property
(object_class, PROP_OPTIONS,
......
......@@ -169,6 +169,8 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class)
* NMDHCP6Config:options:
*
* The #GHashTable containing options of the configuration.
*
* Type: GHashTable<utf8,GValue>
**/
g_object_class_install_property
(object_class, PROP_OPTIONS,
......
......@@ -567,6 +567,21 @@ auto_register_cb (gpointer user_data)
/**************************************************************/
/**
* nm_secret_agent_get_secrets:
* @self: a #NMSecretAgent
* @connection: the #NMConnection for which we're asked secrets
* @setting_name: the name of the secret setting
* @hints: (array zero-terminated=1): hints to the agent
* @flags:
* @callback: (scope async): a callback, invoked when the operation is done
* @callback_data: (closure):
*
* Asyncronously retrieve secrets belonging to @connection for the
* setting @setting_name.
*
* VFunc: get_secrets
*/
void
nm_secret_agent_get_secrets (NMSecretAgent *self,
NMConnection *connection,
......@@ -595,6 +610,18 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
callback_data);
}
/**
* nm_secret_agent_save_secrets:
* @self: a #NMSecretAgent
* @connection: a #NMConnection
* @callback: (scope async): a callback, invoked when the operation is done
* @callback_data: (closure):
*
* Asyncronously ensure that all secrets inside @connection
* are stored to disk.
*
* VFunc: save_secrets
*/
void
nm_secret_agent_save_secrets (NMSecretAgent *self,
NMConnection *connection,
......@@ -614,6 +641,18 @@ nm_secret_agent_save_secrets (NMSecretAgent *self,
callback_data);
}
/**
* nm_secret_agent_delete_secrets:
* @self: a #NMSecretAgent
* @connection: a #NMConnection
* @callback: (scope async): a callback, invoked when the operation is done
* @callback_data: (closure):
*
* Asynchronously ask the agent to delete all saved secrets belonging to
* @connection.
*
* VFunc: delete_secrets
*/
void
nm_secret_agent_delete_secrets (NMSecretAgent *self,
NMConnection *connection,
......
......@@ -493,7 +493,7 @@ validate_permissions_type (GHashTable *hash, GError **error)
/**
* nm_connection_replace_settings:
* @connection: a #NMConnection
* @new_settings: (element-type utf8 GLib.HashTable): a #GHashTable of settings
* @new_settings: (element-type utf8 GHashTable<utf8,GValue>): a #GHashTable of settings
* @error: location to store error, or %NULL
*
* Returns: %TRUE if the settings were valid and added to the connection, %FALSE
......@@ -728,11 +728,12 @@ add_setting_to_list (gpointer key, gpointer data, gpointer user_data)
/**
* nm_connection_need_secrets:
* @connection: the #NMConnection
* @hints: the address of a pointer to a #GPtrArray, initialized to NULL, which
* on return points to an allocated #GPtrArray containing the property names of
* secrets of the #NMSetting which may be required; the caller owns the array
* and must free the each array element with g_free(), as well as the array
* itself with g_ptr_array_free()
* @hints: (out callee-allocates) (element-type utf8) (allow-none) (transfer full):
* the address of a pointer to a #GPtrArray, initialized to NULL, which on
* return points to an allocated #GPtrArray containing the property names of
* secrets of the #NMSetting which may be required; the caller owns the array
* and must free the each array element with g_free(), as well as the array
* itself with g_ptr_array_free()
*
* Returns the name of the first setting object in the connection which would
* need secrets to make a successful connection. The returned hints are only
......@@ -741,7 +742,7 @@ add_setting_to_list (gpointer key, gpointer data, gpointer user_data)
* secrets are needed.
*
* Returns: the setting name of the #NMSetting object which has invalid or
* missing secrets
* missing secrets
**/
const char *
nm_connection_need_secrets (NMConnection *connection,
......@@ -821,7 +822,7 @@ nm_connection_clear_secrets (NMConnection *connection)
* are #GHashTables mapping string:GValue, each of which represents the
* properties of the #NMSetting object.
*
* Returns: (transfer full) (element-type utf8 GLib.HashTable): a new
* Returns: (transfer full) (element-type utf8 GHashTable<utf8,GValue>): a new
* #GHashTable describing the connection, its settings, and each setting's
* properties. The caller owns the hash table and must unref the hash table
* with g_hash_table_unref() when it is no longer needed.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment