From aea3593a43aacd1d903a91624c3822885f56593d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 10 Feb 2015 12:24:25 +0100 Subject: [PATCH 1/2] libnm: don't use deprecated tags for GOobject introspection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Top level tags are deprecated in favour of identifier annotations. https://mail.gnome.org/archives/commits-list/2013-October/msg03220.html https://wiki.gnome.org/action/show/Projects/GObjectIntrospection/Annotations?action=show&redirect=GObjectIntrospection%2FAnnotations#Type_signature Signed-off-by: Jiří Klimeš https://bugzilla.gnome.org/show_bug.cgi?id=744250 --- libnm-core/nm-setting-bond.c | 4 +--- libnm-core/nm-setting-vpn.c | 8 ++------ libnm-core/nm-setting-wired.c | 4 +--- libnm/nm-dhcp-config.c | 4 +--- libnm/nm-secret-agent-old.c | 12 +++--------- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 829cda2ef..9b4b36416 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -977,13 +977,11 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) /* Properties */ /** - * NMSettingBond:options: + * 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 * (ie, [a-zA-Z0-9]). - * - * Type: GHashTable(utf8,utf8) **/ /* ---ifcfg-rh--- * property: options diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index b25a43e3a..a921f51fe 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -945,12 +945,10 @@ nm_setting_vpn_class_init (NMSettingVpnClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingVpn:data: + * NMSettingVpn:data: (type GHashTable(utf8,utf8)): * * Dictionary of key/value pairs of VPN plugin specific data. Both keys and * values must be strings. - * - * Type: GHashTable(utf8,utf8) **/ /* ---keyfile--- * property: data @@ -972,12 +970,10 @@ nm_setting_vpn_class_init (NMSettingVpnClass *setting_class) _nm_utils_strdict_from_dbus); /** - * NMSettingVpn:secrets: + * 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. - * - * Type: GHashTable(utf8,utf8) **/ /* ---keyfile--- * property: secrets diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 09ed8949d..3ad312e59 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -1363,14 +1363,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingWired:s390-options: + * 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", * "portname", "protocol", among others. Key names must contain only * alphanumeric characters (ie, [a-zA-Z0-9]). - * - * Type: GHashTable(utf8,utf8) **/ /* ---ifcfg-rh--- * property: s390-options diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c index 33b99ed04..3f835670d 100644 --- a/libnm/nm-dhcp-config.c +++ b/libnm/nm-dhcp-config.c @@ -154,11 +154,9 @@ nm_dhcp_config_class_init (NMDhcpConfigClass *config_class) G_PARAM_STATIC_STRINGS)); /** - * NMDhcpConfig:options: + * NMDhcpConfig:options: (type GHashTable(utf8,utf8)): * * The #GHashTable containing options of the configuration. - * - * Type: GLib.HashTable(utf8,utf8) **/ g_object_class_install_property (object_class, PROP_OPTIONS, diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 20324045d..749145126 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, From a751398785f948e8e2ba445b4cf8d498de86cb07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 10 Feb 2015 14:03:20 +0100 Subject: [PATCH 2/2] libnm-glib: do not use deprecated Gtk-Doc Type: and Virtual: tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiří Klimeš https://bugzilla.gnome.org/show_bug.cgi?id=744250 --- libnm-glib/nm-client.c | 3 +-- libnm-glib/nm-dhcp4-config.c | 4 +--- libnm-glib/nm-dhcp6-config.c | 4 +--- libnm-glib/nm-secret-agent.c | 12 +++--------- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index ad9069836..c14d8c969 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 4acdeae76..e446280f1 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 aebea8df6..c35fb3ba9 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 75129e06f..69c81d072 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,