summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2016-10-14 10:04:11 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2016-10-14 10:05:54 +0200
commit185f0085218f1e557e76c1035881cdb5087b9436 (patch)
tree298f75f1118ee6c18b78c26bd8aa984f1c2417a3
parent54f701b95c72edb3ac0aa6cb57bbb50f43172d3f (diff)
libnm-core: fix documentation comments
../libnm-core/nm-utils.c:4405: Warning: NM: nm_utils_is_json_object: unknown parameter 'str' in documentation comment, should be 'json' ../libnm-core/nm-connection.c:2208: Warning: NM: nm_connection_get_setting_proxy: return value: Missing (transfer) annotation
-rw-r--r--libnm-core/nm-connection.c2
-rw-r--r--libnm-core/nm-utils.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index d26f57a65..ff56cfbf3 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -2205,7 +2205,7 @@ nm_connection_get_setting_pppoe (NMConnection *connection)
*
* A shortcut to return any #NMSettingProxy the connection might contain.
*
- * Returns:an #NMSettingProxy if the connection contains one, otherwise %NULL
+ * Returns: (transfer none): an #NMSettingProxy if the connection contains one, otherwise %NULL
*
* Since: 1.6
**/
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index 4fabfdb7b..69dcf55a2 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -91,7 +91,7 @@ gboolean nm_utils_wep_key_valid (const char *key, NMWepKeyType wep_type);
gboolean nm_utils_wpa_psk_valid (const char *psk);
NM_AVAILABLE_IN_1_6
-gboolean nm_utils_is_json_object (const char *json, GError **error);
+gboolean nm_utils_is_json_object (const char *str, GError **error);
GVariant *nm_utils_ip4_dns_to_variant (char **dns);
char **nm_utils_ip4_dns_from_variant (GVariant *value);