From 889961f8b6c3a29c93fa01fa9cfae21cf0373af6 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 9 Jul 2018 19:09:44 +0200 Subject: [PATCH 1/3] all/trivial: grammar fix --- introspection/org.freedesktop.NetworkManager.Device.Bond.xml | 2 +- .../org.freedesktop.NetworkManager.Device.Bridge.xml | 2 +- introspection/org.freedesktop.NetworkManager.Device.Team.xml | 2 +- libnm-glib/nm-device-bond.c | 4 ++-- libnm-glib/nm-device-bridge.c | 4 ++-- libnm/nm-device-bond.c | 4 ++-- libnm/nm-device-bridge.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml index 9ee24e8107..e3b5574e8c 100644 --- a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml +++ b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml @@ -25,7 +25,7 @@ diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml index e64e400627..7f2605699d 100644 --- a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml +++ b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml @@ -25,7 +25,7 @@ diff --git a/introspection/org.freedesktop.NetworkManager.Device.Team.xml b/introspection/org.freedesktop.NetworkManager.Device.Team.xml index c187b511d1..2318dd6fcf 100644 --- a/introspection/org.freedesktop.NetworkManager.Device.Team.xml +++ b/introspection/org.freedesktop.NetworkManager.Device.Team.xml @@ -25,7 +25,7 @@ diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index bd5bc216a7..a4f0f5014c 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -134,7 +134,7 @@ nm_device_bond_get_carrier (NMDeviceBond *device) * nm_device_bond_get_slaves: * @device: a #NMDeviceBond * - * 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 @@ -333,7 +333,7 @@ nm_device_bond_class_init (NMDeviceBondClass *bond_class) /** * NMDeviceBond:slaves: * - * The devices (#NMDevice) slaved to the bond device. + * The devices (#NMDevice) enslaved to the bond device. * * Since: 0.9.8 **/ diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index 20d65cfad3..d5a2bbbcc7 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -142,7 +142,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 @@ -345,7 +345,7 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) /** * NMDeviceBridge:slaves: * - * The devices (#NMDevice) slaved to the bridge device. + * The devices (#NMDevice) enslaved to the bridge device. * * Since: 0.9.8 **/ diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 9c43598f64..83b7c3b418 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -86,7 +86,7 @@ nm_device_bond_get_carrier (NMDeviceBond *device) * nm_device_bond_get_slaves: * @device: a #NMDeviceBond * - * 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 @@ -250,7 +250,7 @@ nm_device_bond_class_init (NMDeviceBondClass *bond_class) /** * NMDeviceBond:slaves: (type GPtrArray(NMDevice)) * - * The devices slaved to the bond device. + * The devices enslaved to the bond device. **/ g_object_class_install_property (object_class, PROP_SLAVES, diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index 76934daa05..39c48d2ac8 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 @@ -255,7 +255,7 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) /** * NMDeviceBridge:slaves: (type GPtrArray(NMDevice)) * - * The devices slaved to the bridge device. + * The devices enslaved to the bridge device. **/ g_object_class_install_property (object_class, PROP_SLAVES, From 8d65f636e1e1692c3043b368390c6f39f8a1466f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 29 Jun 2018 22:52:43 +0200 Subject: [PATCH 2/3] devices/ovs: expose slaves on D-Bus for OVS bridges and ports --- ...org.freedesktop.NetworkManager.Device.OvsBridge.xml | 10 ++++++++++ .../org.freedesktop.NetworkManager.Device.OvsPort.xml | 10 ++++++++++ src/devices/nm-device.h | 3 ++- src/devices/ovs/nm-device-ovs-bridge.c | 3 +++ src/devices/ovs/nm-device-ovs-port.c | 3 +++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml index 08ed5dc01b..402ee028b3 100644 --- a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml +++ b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml @@ -7,6 +7,16 @@ --> + + + + + +