Imported Upstream version 0.8.998upstream/0.8.998

1 files changed, 25 insertions, 18 deletions

diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c
index fe71c1b8d..7e9bf3cd8 100644
--- a/libnm-glib/nm-ip6-config.c
+++ b/libnm-glib/nm-ip6-config.c
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2007 - 2008 Novell, Inc.
- * Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2008 - 2011 Red Hat, Inc.
  */
 
 #include <string.h>
@@ -60,7 +60,7 @@ enum {
  *
  * Creates a new #NMIP6Config.
  *
- * Returns: a new IP6 configuration
+ * Returns: (transfer full): a new IP6 configuration
  **/
 GObject *
 nm_ip6_config_new (DBusGConnection *connection, const char *object_path)
@@ -146,8 +146,9 @@ register_for_property_changed (NMIP6Config *config)
  *
  * Gets the IP6 addresses (containing the address, prefix, and gateway).
  *
- * Returns: the #GSList containing #NMSettingIP6Address<!-- -->es. This is the internal copy
- * used by the configuration and must not be modified.
+ * Returns: (element-type NetworkManager.IP6Address): the #GSList containing
+ * #NMIP6Address<!-- -->es. This is the internal copy used by the configuration
+ * and must not be modified.
  **/
 const GSList *
 nm_ip6_config_get_addresses (NMIP6Config *config)
@@ -155,7 +156,7 @@ nm_ip6_config_get_addresses (NMIP6Config *config)
 	NMIP6ConfigPrivate *priv;
 	GValue value = { 0, };
 
-	g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0);
+	g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL);
 
 	priv = NM_IP6_CONFIG_GET_PRIVATE (config);
 	if (priv->addresses)
@@ -164,7 +165,8 @@ nm_ip6_config_get_addresses (NMIP6Config *config)
 	if (!_nm_object_get_property (NM_OBJECT (config),
 	                              NM_DBUS_INTERFACE_IP6_CONFIG,
 	                              "Addresses",
-	                              &value)) {
+	                              &value,
+	                              NULL)) {
 		return NULL;
 	}
 
@@ -174,15 +176,16 @@ nm_ip6_config_get_addresses (NMIP6Config *config)
 	return priv->addresses;
 }
 
+/* FIXME: like in libnm_util, in6_addr is not introspectable, so skipping here */
 /**
- * nm_ip6_config_get_nameservers:
+ * nm_ip6_config_get_nameservers: (skip)
  * @config: a #NMIP6Config
  *
  * Gets the domain name servers (DNS).
  *
- * Returns: a #GSList containing elements of type 'struct in6_addr' which contain
- * the addresses of nameservers of the configuration.  This is the internal copy
- * used by the configuration and must not be modified.
+ * Returns: (element-type Posix.in6_addr): a #GSList containing elements of type
+ * 'struct in6_addr' which contain the addresses of nameservers of the configuration.
+ * This is the internal copy used by the configuration and must not be modified.
  **/
 const GSList *
 nm_ip6_config_get_nameservers (NMIP6Config *config)
@@ -200,7 +203,8 @@ nm_ip6_config_get_nameservers (NMIP6Config *config)
 	if (!_nm_object_get_property (NM_OBJECT (config),
 	                              NM_DBUS_INTERFACE_IP6_CONFIG,
 	                              "Nameservers",
-	                              &value)) {
+	                              &value,
+	                              NULL)) {
 		return NULL;
 	}
 
@@ -217,8 +221,8 @@ nm_ip6_config_get_nameservers (NMIP6Config *config)
  *
  * Gets the domain names.
  *
- * Returns: the #GPtrArray containing domains as strings. This is the 
- * internal copy used by the configuration, and must not be modified.
+ * Returns: (element-type utf8): the #GPtrArray containing domains as strings.
+ * This is the internal copy used by the configuration, and must not be modified.
  **/
 const GPtrArray *
 nm_ip6_config_get_domains (NMIP6Config *config)
@@ -235,7 +239,8 @@ nm_ip6_config_get_domains (NMIP6Config *config)
 	if (!_nm_object_get_property (NM_OBJECT (config),
 	                              NM_DBUS_INTERFACE_IP6_CONFIG,
 	                              "Domains",
-	                              &value)) {
+	                              &value,
+	                              NULL)) {
 		return NULL;
 	}
 
@@ -251,8 +256,9 @@ nm_ip6_config_get_domains (NMIP6Config *config)
  *
  * Gets the routes.
  *
- * Returns: the #GSList containing #NMSettingIP6Route<!-- -->s. This is the 
- * internal copy used by the configuration, and must not be modified.
+ * Returns: (element-type NetworkManager.IP6Route): the #GSList containing
+ * #NMIP6Route<!-- -->s. This is the internal copy used by the configuration,
+ * and must not be modified.
  **/
 const GSList *
 nm_ip6_config_get_routes (NMIP6Config *config)
@@ -260,7 +266,7 @@ nm_ip6_config_get_routes (NMIP6Config *config)
 	NMIP6ConfigPrivate *priv;
 	GValue value = { 0, };
 
-	g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0);
+	g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL);
 
 	priv = NM_IP6_CONFIG_GET_PRIVATE (config);
 	if (priv->routes)
@@ -269,7 +275,8 @@ nm_ip6_config_get_routes (NMIP6Config *config)
 	if (!_nm_object_get_property (NM_OBJECT (config),
 	                              NM_DBUS_INTERFACE_IP6_CONFIG,
 	                              "Routes",
-	                              &value)) {
+	                              &value,
+	                              NULL)) {
 		return NULL;
 	}