diff options
author | Thomas Haller <thaller@redhat.com> | 2018-03-26 12:49:15 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-03-26 12:50:43 +0200 |
commit | fc813d1c9e40ead0d0ae723bb3393b6af094ea9c (patch) | |
tree | 71922c823114e7d87827d2d2a6a7e3de2e9e377b | |
parent | 468a01933323f66c55ff2c1db78cf6d7996a3289 (diff) | |
parent | a751398785f948e8e2ba445b4cf8d498de86cb07 (diff) | |
download | NetworkManager-fc813d1c9e40ead0d0ae723bb3393b6af094ea9c.tar.gz |
libnm: don't use deprecated tags for GOobject introspection
https://bugzilla.gnome.org/show_bug.cgi?id=744250
https://bugzilla.gnome.org/show_bug.cgi?id=794658
-rw-r--r-- | libnm-core/nm-setting-bond.c | 2 | ||||
-rw-r--r-- | libnm-core/nm-setting-vpn.c | 4 | ||||
-rw-r--r-- | libnm-core/nm-setting-wired.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-client.c | 3 | ||||
-rw-r--r-- | libnm-glib/nm-dhcp4-config.c | 4 | ||||
-rw-r--r-- | libnm-glib/nm-dhcp6-config.c | 4 | ||||
-rw-r--r-- | libnm-glib/nm-secret-agent.c | 12 | ||||
-rw-r--r-- | libnm/nm-dhcp-config.c | 2 | ||||
-rw-r--r-- | libnm/nm-secret-agent-old.c | 12 |
9 files changed, 14 insertions, 31 deletions
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 8f6b375d82..9b4b364162 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -977,7 +977,7 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) /* Properties */ /** - * NMSettingBond:options: (type GHashTable(utf8,utf8)) + * NMSettingBond:options: (type GHashTable(utf8,utf8)): * * Dictionary of key/value pairs of bonding options. Both keys and values * must be strings. Option names must contain only alphanumeric characters diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index facece1cd8..a921f51fed 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -945,7 +945,7 @@ nm_setting_vpn_class_init (NMSettingVpnClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingVpn:data: (type GHashTable(utf8,utf8)) + * NMSettingVpn:data: (type GHashTable(utf8,utf8)): * * Dictionary of key/value pairs of VPN plugin specific data. Both keys and * values must be strings. @@ -970,7 +970,7 @@ nm_setting_vpn_class_init (NMSettingVpnClass *setting_class) _nm_utils_strdict_from_dbus); /** - * NMSettingVpn:secrets: (type GHashTable(utf8,utf8)) + * NMSettingVpn:secrets: (type GHashTable(utf8,utf8)): * * Dictionary of key/value pairs of VPN plugin specific secrets like * passwords or private keys. Both keys and values must be strings. diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index cae8dd6521..3ad312e599 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -1363,7 +1363,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)) + * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)): * * Dictionary of key/value pairs of s390-specific device options. Both keys * and values must be strings. Allowed keys include "portno", "layer2", diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index ad90698367..c14d8c9690 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -2329,10 +2329,9 @@ nm_client_class_init (NMClientClass *client_class) G_PARAM_STATIC_STRINGS)); /** - * NMClient:active-connections: + * NMClient:active-connections: (type GPtrArray): * * The active connections. - * Type: GLib.PtrArray **/ g_object_class_install_property (object_class, PROP_ACTIVE_CONNECTIONS, diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c index 4acdeae76e..e446280f1d 100644 --- a/libnm-glib/nm-dhcp4-config.c +++ b/libnm-glib/nm-dhcp4-config.c @@ -148,11 +148,9 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class) /* properties */ /** - * NMDHCP4Config:options: + * NMDHCP4Config:options: (type GHashTable(utf8,GObject.Value)): * * The #GHashTable containing options of the configuration. - * - * Type: GLib.HashTable(utf8,GObject.Value) **/ 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 aebea8df6a..c35fb3ba9b 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -148,11 +148,9 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class) /* properties */ /** - * NMDHCP6Config:options: + * NMDHCP6Config:options: (type GHashTable(utf8,GObject.Value)): * * The #GHashTable containing options of the configuration. - * - * Type: GLib.HashTable(utf8,GObject.Value) **/ 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 75129e06f8..69c81d072b 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -695,7 +695,7 @@ auto_register_cb (gpointer user_data) /*****************************************************************************/ /** - * nm_secret_agent_get_secrets: + * nm_secret_agent_get_secrets: (virtual get_secrets): * @self: a #NMSecretAgent * @connection: the #NMConnection for which we're asked secrets * @setting_name: the name of the secret setting @@ -709,8 +709,6 @@ auto_register_cb (gpointer user_data) * agent should use when performing the request, for example returning only * existing secrets without user interaction, or requesting entirely new * secrets from the user. - * - * Virtual: get_secrets */ void nm_secret_agent_get_secrets (NMSecretAgent *self, @@ -739,7 +737,7 @@ nm_secret_agent_get_secrets (NMSecretAgent *self, } /** - * nm_secret_agent_save_secrets: + * nm_secret_agent_save_secrets: (virtual save_secrets): * @self: a #NMSecretAgent * @connection: a #NMConnection * @callback: (scope async): a callback, to be invoked when the operation is done @@ -747,8 +745,6 @@ nm_secret_agent_get_secrets (NMSecretAgent *self, * * Asyncronously ensure that all secrets inside @connection * are stored to disk. - * - * Virtual: save_secrets */ void nm_secret_agent_save_secrets (NMSecretAgent *self, @@ -768,7 +764,7 @@ nm_secret_agent_save_secrets (NMSecretAgent *self, } /** - * nm_secret_agent_delete_secrets: + * nm_secret_agent_delete_secrets: (virtual delete_secrets): * @self: a #NMSecretAgent * @connection: a #NMConnection * @callback: (scope async): a callback, to be invoked when the operation is done @@ -776,8 +772,6 @@ nm_secret_agent_save_secrets (NMSecretAgent *self, * * Asynchronously ask the agent to delete all saved secrets belonging to * @connection. - * - * Virtual: delete_secrets */ void nm_secret_agent_delete_secrets (NMSecretAgent *self, diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c index ac95003558..3f835670dd 100644 --- a/libnm/nm-dhcp-config.c +++ b/libnm/nm-dhcp-config.c @@ -154,7 +154,7 @@ nm_dhcp_config_class_init (NMDhcpConfigClass *config_class) G_PARAM_STATIC_STRINGS)); /** - * NMDhcpConfig:options: (type GHashTable(utf8,utf8)) + * NMDhcpConfig:options: (type GHashTable(utf8,utf8)): * * The #GHashTable containing options of the configuration. **/ diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 20324045da..7491451262 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -882,7 +882,7 @@ nm_secret_agent_old_get_registered (NMSecretAgentOld *self) /*****************************************************************************/ /** - * nm_secret_agent_old_get_secrets: + * nm_secret_agent_old_get_secrets: (virtual get_secrets): * @self: a #NMSecretAgentOld * @connection: the #NMConnection for which we're asked secrets * @setting_name: the name of the secret setting @@ -896,8 +896,6 @@ nm_secret_agent_old_get_registered (NMSecretAgentOld *self) * agent should use when performing the request, for example returning only * existing secrets without user interaction, or requesting entirely new * secrets from the user. - * - * Virtual: get_secrets */ void nm_secret_agent_old_get_secrets (NMSecretAgentOld *self, @@ -928,7 +926,7 @@ nm_secret_agent_old_get_secrets (NMSecretAgentOld *self, } /** - * nm_secret_agent_old_save_secrets: + * nm_secret_agent_old_save_secrets: (virtual save_secrets): * @self: a #NMSecretAgentOld * @connection: a #NMConnection * @callback: (scope async): a callback, to be invoked when the operation is done @@ -936,8 +934,6 @@ nm_secret_agent_old_get_secrets (NMSecretAgentOld *self, * * Asynchronously ensures that all secrets inside @connection are stored to * disk. - * - * Virtual: save_secrets */ void nm_secret_agent_old_save_secrets (NMSecretAgentOld *self, @@ -957,7 +953,7 @@ nm_secret_agent_old_save_secrets (NMSecretAgentOld *self, } /** - * nm_secret_agent_old_delete_secrets: + * nm_secret_agent_old_delete_secrets: (virtual delete_secrets): * @self: a #NMSecretAgentOld * @connection: a #NMConnection * @callback: (scope async): a callback, to be invoked when the operation is done @@ -965,8 +961,6 @@ nm_secret_agent_old_save_secrets (NMSecretAgentOld *self, * * Asynchronously asks the agent to delete all saved secrets belonging to * @connection. - * - * Virtual: delete_secrets */ void nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self, |