diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2018-09-24 09:29:55 +0100 |
|---|---|---|
| committer | Iain Lane <iain@orangesquash.org.uk> | 2018-09-24 09:29:55 +0100 |
| commit | e152ec7bf4ba252ff9d3eb13eabd417b931dac9a (patch) | |
| tree | c323cf856ee0bb8e44590670dd54c19653a55748 /libnm/nm-device-bridge.c | |
| parent | ee9c73a923909e23a649407be77e25235d769e25 (diff) | |
Import Upstream version 1.12.2
Diffstat (limited to 'libnm/nm-device-bridge.c')
| -rw-r--r-- | libnm/nm-device-bridge.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index 27f362b2..39c48d2a 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -86,7 +86,7 @@ nm_device_bridge_get_carrier (NMDeviceBridge *device) * nm_device_bridge_get_slaves: * @device: a #NMDeviceBridge * - * Gets the devices currently slaved to @device. + * Gets the devices currently enslaved to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal @@ -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 + * The devices enslaved to the bridge device. **/ g_object_class_install_property (object_class, PROP_SLAVES, |