Commit d5fb24b5 authored by Martin Pitt's avatar Martin Pitt Committed by Dan Winship
Browse files

libnm-glib: Make SecretAgent introspectable

Use the correct annotation for vfuncs, so that NMClient.SecretAgent becomes
introspectable.

Use "self" as the first argument of the vfuncs in their declarations, to match
the actual name in nm-secret-agent.c. This avoids warnings from g-ir-scanner.

https://bugzilla.gnome.org/show_bug.cgi?id=698184
parent d3ea9ee4
......@@ -689,7 +689,7 @@ auto_register_cb (gpointer user_data)
* existing secrets without user interaction, or requesting entirely new
* secrets from the user.
*
* VFunc: get_secrets
* Virtual: get_secrets
*/
void
nm_secret_agent_get_secrets (NMSecretAgent *self,
......@@ -727,7 +727,7 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
* Asyncronously ensure that all secrets inside @connection
* are stored to disk.
*
* VFunc: save_secrets
* Virtual: save_secrets
*/
void
nm_secret_agent_save_secrets (NMSecretAgent *self,
......@@ -756,7 +756,7 @@ nm_secret_agent_save_secrets (NMSecretAgent *self,
* Asynchronously ask the agent to delete all saved secrets belonging to
* @connection.
*
* VFunc: delete_secrets
* Virtual: delete_secrets
*/
void
nm_secret_agent_delete_secrets (NMSecretAgent *self,
......
......@@ -195,12 +195,12 @@ typedef struct {
/* Called when the subclass should retrieve and return secrets. Subclass
* must copy or reference any arguments it may require after returning from
* this method, as the arguments will freed (except for 'agent', 'callback',
* this method, as the arguments will freed (except for 'self', 'callback',
* and 'user_data' of course). If the request is canceled, the callback
* should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
* error.
*/
void (*get_secrets) (NMSecretAgent *agent,
void (*get_secrets) (NMSecretAgent *self,
NMConnection *connection,
const char *connection_path,
const char *setting_name,
......@@ -215,17 +215,17 @@ typedef struct {
* call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
* error to that callback.
*/
void (*cancel_get_secrets) (NMSecretAgent *agent,
void (*cancel_get_secrets) (NMSecretAgent *self,
const char *connection_path,
const char *setting_name);
/* Called when the subclass should save the secrets contained in the
* connection to backing storage. Subclass must copy or reference any
* arguments it may require after returning from this method, as the
* arguments will freed (except for 'agent', 'callback', and 'user_data'
* arguments will freed (except for 'self', 'callback', and 'user_data'
* of course).
*/
void (*save_secrets) (NMSecretAgent *agent,
void (*save_secrets) (NMSecretAgent *self,
NMConnection *connection,
const char *connection_path,
NMSecretAgentSaveSecretsFunc callback,
......@@ -234,10 +234,10 @@ typedef struct {
/* Called when the subclass should delete the secrets contained in the
* connection from backing storage. Subclass must copy or reference any
* arguments it may require after returning from this method, as the
* arguments will freed (except for 'agent', 'callback', and 'user_data'
* arguments will freed (except for 'self', 'callback', and 'user_data'
* of course).
*/
void (*delete_secrets) (NMSecretAgent *agent,
void (*delete_secrets) (NMSecretAgent *self,
NMConnection *connection,
const char *connection_path,
NMSecretAgentDeleteSecretsFunc callback,
......
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