diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 09:24:19 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 12:01:26 -0500 |
| commit | 240934659cd8326a14324c73d4f0f88eecfddcab (patch) | |
| tree | e07cde48aa0a143bebf10ca7103cc0e69febad25 /src/libnm-client-public/nm-device-bridge.h | |
| parent | fbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff) | |
| parent | 1628eda029ba4dede8d4d45572c6b60367882436 (diff) | |
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'src/libnm-client-public/nm-device-bridge.h')
| -rw-r--r-- | src/libnm-client-public/nm-device-bridge.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libnm-client-public/nm-device-bridge.h b/src/libnm-client-public/nm-device-bridge.h index a6c50658..07905195 100644 --- a/src/libnm-client-public/nm-device-bridge.h +++ b/src/libnm-client-public/nm-device-bridge.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_BRIDGE_H__ #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION) - #error "Only <NetworkManager.h> can be included directly." +#error "Only <NetworkManager.h> can be included directly." #endif #include "nm-device.h" @@ -38,7 +38,9 @@ GType nm_device_bridge_get_type(void); NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) const char *nm_device_bridge_get_hw_address(NMDeviceBridge *device); -gboolean nm_device_bridge_get_carrier(NMDeviceBridge *device); +gboolean nm_device_bridge_get_carrier(NMDeviceBridge *device); + +NM_DEPRECATED_IN_1_34_FOR(nm_device_get_ports) const GPtrArray *nm_device_bridge_get_slaves(NMDeviceBridge *device); G_END_DECLS |