gobject-introspection: made several fixes to the annotations

https://bugzilla.gnome.org/show_bug.cgi?id=794658

12 files changed, 17 insertions, 40 deletions

diff --git a/libnm/meson.build b/libnm/meson.build
index b01361e0c..4e985b0aa 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -201,6 +201,7 @@ if enable_introspection
     export_packages: libnm_name,
     includes: 'Gio-2.0',
     extra_args: cflags,
+    header: 'NetworkManager.h',
     install: true
   )
 
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index a0ea8a254..6560fb8ec 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -661,11 +661,9 @@ nm_active_connection_class_init (NMActiveConnectionClass *ap_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMActiveConnection:devices:
+	 * NMActiveConnection:devices: (type GPtrArray(NMDevice))
 	 *
 	 * The devices of the active connection.
-	 *
-	 * Element-type: NMDevice
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_DEVICES,
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c
index 264c81953..890e2f851 100644
--- a/libnm/nm-checkpoint.c
+++ b/libnm/nm-checkpoint.c
@@ -176,7 +176,7 @@ nm_checkpoint_class_init (NMCheckpointClass *checkpoint_class)
 	nm_object_class->init_dbus = init_dbus;
 
 	/**
-	 * NMCheckpoint:devices:
+	 * NMCheckpoint:devices: (type GPtrArray(NMDevice))
 	 *
 	 * The devices that are part of this checkpoint.
 	 *
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 9218df52b..da0c10080 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -3280,11 +3280,9 @@ nm_client_class_init (NMClientClass *client_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient:active-connections:
+	 * NMClient:active-connections: (type GPtrArray(NMActiveConnection))
 	 *
 	 * The active connections.
-	 *
-	 * Element-type: NMActiveConnection
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_ACTIVE_CONNECTIONS,
@@ -3361,11 +3359,9 @@ nm_client_class_init (NMClientClass *client_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient:devices:
+	 * NMClient:devices: (type GPtrArray(NMDevice))
 	 *
 	 * List of real network devices.  Does not include placeholder devices.
-	 *
-	 * Element-type: NMDevice
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_DEVICES,
@@ -3375,11 +3371,9 @@ nm_client_class_init (NMClientClass *client_class)
 		                     G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient:all-devices:
+	 * NMClient:all-devices: (type GPtrArray(NMDevice))
 	 *
 	 * List of both real devices and device placeholders.
-	 *
-	 * Element-type: NMDevice
 	 * Since: 1.2
 	 **/
 	g_object_class_install_property
@@ -3390,14 +3384,12 @@ nm_client_class_init (NMClientClass *client_class)
 		                     G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient:connections:
+	 * NMClient:connections: (type GPtrArray(NMRemoteConnection))
 	 *
 	 * The list of configured connections that are available to the user. (Note
 	 * that this differs from the underlying D-Bus property, which may also
 	 * contain the object paths of connections that the user does not have
 	 * permission to read the details of.)
-	 *
-	 * Element-type: NMRemoteConnection
 	 */
 	g_object_class_install_property
 		(object_class, PROP_CONNECTIONS,
@@ -3474,7 +3466,7 @@ nm_client_class_init (NMClientClass *client_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient:dns-configuration:
+	 * NMClient:dns-configuration: (type GPtrArray(GVariant))
 	 *
 	 * The current DNS configuration represented as an array of
 	 * dictionaries.  Each dictionary has the "nameservers",
@@ -3494,7 +3486,7 @@ nm_client_class_init (NMClientClass *client_class)
 		                     G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient::checkpoints
+	 * NMClient:checkpoints: (type GPtrArray(NMCheckpoint))
 	 *
 	 * The list of active checkpoints.
 	 *
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 963348400..9c43598f6 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -248,11 +248,9 @@ nm_device_bond_class_init (NMDeviceBondClass *bond_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMDeviceBond:slaves:
+	 * NMDeviceBond:slaves: (type GPtrArray(NMDevice))
 	 *
 	 * The devices slaved to the bond device.
-	 *
-	 * Element-type: NMDevice
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_SLAVES,
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 27f362b2d..76934daa0 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -253,11 +253,9 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMDeviceBridge:slaves:
+	 * NMDeviceBridge:slaves: (type GPtrArray(NMDevice))
 	 *
 	 * The devices slaved to the bridge device.
-	 *
-	 * Element-type: NMDevice
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_SLAVES,
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index 0b62b864b..101e3160e 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -274,11 +274,9 @@ nm_device_team_class_init (NMDeviceTeamClass *team_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMDeviceTeam:slaves:
+	 * NMDeviceTeam:slaves: (type GPtrArray(NMDevice))
 	 *
 	 * The devices enslaved to the team device.
-	 *
-	 * Element-type: NMDevice
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_SLAVES,
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index e4ea94e96..1f2118fa6 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -887,11 +887,9 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class)
 		                     G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMDeviceWifi:access-points:
+	 * NMDeviceWifi:access-points: (type GPtrArray(NMAccessPoint))
 	 *
 	 * List of all Wi-Fi access points the device can see.
-	 *
-	 * Element-type: NMAccessPoint
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_ACCESS_POINTS,
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index fd0a2dc5c..7134024f3 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -650,11 +650,9 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *wimax_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMDeviceWimax:nsps:
+	 * NMDeviceWimax:nsps: (type GPtrArray(NMWimaxNsp))
 	 *
 	 * List of all WiMAX Network Service Providers the device can see.
-	 *
-	 * Element-type: NMWimaxNsp
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_NSPS,
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 4d530f78b..d8b2cf1fa 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -735,11 +735,9 @@ nm_device_class_init (NMDeviceClass *device_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMDevice:available-connections:
+	 * NMDevice:available-connections: (type GPtrArray(NMRemoteConnection))
 	 *
 	 * The available connections of the device
-	 *
-	 * Element-type: NMRemoteConnection
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_AVAILABLE_CONNECTIONS,
diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c
index 33b99ed04..ac9500355 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-ip-config.c b/libnm/nm-ip-config.c
index 74db9994f..ca99b1d40 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -304,7 +304,7 @@ nm_ip_config_class_init (NMIPConfigClass *config_class)
 	                         G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMIPConfig:routes:
+	 * NMIPConfig:routes: (type GPtrArray(NMIPRoute))
 	 *
 	 * A #GPtrArray containing the routes (#NMIPRoute) of the configuration.
 	 **/