diff options
author | Giovanni Campagna <gcampagna@src.gnome.org> | 2011-02-21 18:11:21 -0600 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2011-02-21 18:11:21 -0600 |
commit | e77acd43b663b3e1011f812bc506c176f65d1415 (patch) | |
tree | 9cd8c17ad9e8f6c01edd043827dc9dfef5bdfe22 /libnm-glib | |
parent | 3b57350dd6d1f1b48119eb66dc170aaf2aef1dc3 (diff) | |
download | NetworkManager-e77acd43b663b3e1011f812bc506c176f65d1415.tar.gz |
libnm-glib: more GObject introspection fixes (bgo #181415)
Fix some annotations and add the necessary ones for new functions.
Diffstat (limited to 'libnm-glib')
-rw-r--r-- | libnm-glib/nm-client.c | 5 | ||||
-rw-r--r-- | libnm-glib/nm-dhcp4-config.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-dhcp6-config.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-secret-agent.c | 39 |
4 files changed, 46 insertions, 2 deletions
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 4e725cf42a..bab86a9ba1 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -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 * diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c index d17578ab31..31dfe25a40 100644 --- a/libnm-glib/nm-dhcp4-config.c +++ b/libnm-glib/nm-dhcp4-config.c @@ -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, diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c index 8b85595c05..7e6e4f8088 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -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, diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 72431e2dae..64d8dc4621 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -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, |