diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-20 23:06:55 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-20 23:06:55 +0100 |
| commit | 6bb18bdca6b7bf811bdd00dbea1b09f3a367d2dc (patch) | |
| tree | 8fec068abdd1bc1ade3839f599e1c18d6c524a6a /libnm-glib/nm-device-bridge.c | |
| parent | fdcb282bbb150da0049cf2dd5b54e56eb3d0b55f (diff) | |
| parent | 8d275584fc94f398f0a7c990dcd057533d9a5856 (diff) | |
Merge tag 'upstream/0.9.8.0' into experimental
Upstream version 0.9.8.0
Diffstat (limited to 'libnm-glib/nm-device-bridge.c')
| -rw-r--r-- | libnm-glib/nm-device-bridge.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index 34e02d6d..9327a931 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -66,6 +66,8 @@ enum { * Registers an error quark for #NMDeviceBridge if necessary. * * Returns: the error quark used for #NMDeviceBridge errors. + * + * Since: 0.9.8 **/ GQuark nm_device_bridge_error_quark (void) @@ -85,6 +87,8 @@ nm_device_bridge_error_quark (void) * Creates a new #NMDeviceBridge. * * Returns: (transfer full): a new device + * + * Since: 0.9.8 **/ GObject * nm_device_bridge_new (DBusGConnection *connection, const char *path) @@ -110,6 +114,8 @@ nm_device_bridge_new (DBusGConnection *connection, const char *path) * * Returns: the hardware address. This is the internal string used by the * device, and must not be modified. + * + * Since: 0.9.8 **/ const char * nm_device_bridge_get_hw_address (NMDeviceBridge *device) @@ -127,6 +133,8 @@ nm_device_bridge_get_hw_address (NMDeviceBridge *device) * Whether the device has carrier. * * Returns: %TRUE if the device has carrier + * + * Since: 0.9.8 **/ gboolean nm_device_bridge_get_carrier (NMDeviceBridge *device) @@ -146,6 +154,8 @@ nm_device_bridge_get_carrier (NMDeviceBridge *device) * Returns: (element-type NMClient.Device): the #GPtrArray containing * #NMDevice<!-- -->s that are slaves of @device. This is the internal * copy used by the device, and must not be modified. + * + * Since: 0.9.8 **/ const GPtrArray * nm_device_bridge_get_slaves (NMDeviceBridge *device) @@ -309,6 +319,8 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) * NMDeviceBridge:hw-address: * * The hardware (MAC) address of the device. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_HW_ADDRESS, @@ -322,6 +334,8 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) * NMDeviceBridge:carrier: * * Whether the device has carrier. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_CARRIER, @@ -335,6 +349,8 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) * NMDeviceBridge:slaves: * * The devices (#NMDevice) slaved to the bridge device. + * + * Since: 0.9.8 **/ g_object_class_install_property (object_class, PROP_SLAVES, |