diff options
Diffstat (limited to 'src/libnm-client-public')
45 files changed, 62 insertions, 51 deletions
diff --git a/src/libnm-client-public/NetworkManager.h b/src/libnm-client-public/NetworkManager.h index f9cc8565..3134562e 100644 --- a/src/libnm-client-public/NetworkManager.h +++ b/src/libnm-client-public/NetworkManager.h @@ -55,6 +55,7 @@ #include "nm-setting-adsl.h" #include "nm-setting-bluetooth.h" #include "nm-setting-bond.h" +#include "nm-setting-bond-port.h" #include "nm-setting-bridge.h" #include "nm-setting-bridge-port.h" #include "nm-setting-cdma.h" @@ -118,13 +119,13 @@ #if !defined(NETWORKMANAGER_COMPILATION) \ && (!defined(NM_NO_INCLUDE_EXTRA_HEADERS) || !NM_NO_INCLUDE_EXTRA_HEADERS) - /* historically, NetworkManager.h drags in the following system headers. +/* historically, NetworkManager.h drags in the following system headers. * These are not strictly necessary and the user may wish to opt out from * including them. */ - #include <linux/if_ether.h> - #include <linux/if_infiniband.h> - #include <linux/if_vlan.h> - #include <netinet/in.h> +#include <linux/if_ether.h> +#include <linux/if_infiniband.h> +#include <linux/if_vlan.h> +#include <netinet/in.h> #endif #undef __NETWORKMANAGER_H_INSIDE__ diff --git a/src/libnm-client-public/nm-access-point.h b/src/libnm-client-public/nm-access-point.h index 0460ea0a..50a74296 100644 --- a/src/libnm-client-public/nm-access-point.h +++ b/src/libnm-client-public/nm-access-point.h @@ -8,7 +8,7 @@ #define __NM_ACCESS_POINT_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-object.h" diff --git a/src/libnm-client-public/nm-active-connection.h b/src/libnm-client-public/nm-active-connection.h index 44b715c7..76ea107a 100644 --- a/src/libnm-client-public/nm-active-connection.h +++ b/src/libnm-client-public/nm-active-connection.h @@ -8,7 +8,7 @@ #define __NM_ACTIVE_CONNECTION_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-object.h" diff --git a/src/libnm-client-public/nm-autoptr.h b/src/libnm-client-public/nm-autoptr.h index f37e2cfc..6c34946c 100644 --- a/src/libnm-client-public/nm-autoptr.h +++ b/src/libnm-client-public/nm-autoptr.h @@ -67,6 +67,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSetting8021x, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingAdsl, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBluetooth, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBond, g_object_unref) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBondPort, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBridge, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBridgePort, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingCdma, g_object_unref) diff --git a/src/libnm-client-public/nm-checkpoint.h b/src/libnm-client-public/nm-checkpoint.h index 3bc28f6f..def1f554 100644 --- a/src/libnm-client-public/nm-checkpoint.h +++ b/src/libnm-client-public/nm-checkpoint.h @@ -7,7 +7,7 @@ #define __NM_CHECKPOINT_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-object.h" diff --git a/src/libnm-client-public/nm-client.h b/src/libnm-client-public/nm-client.h index 0145c5f4..02c8ee33 100644 --- a/src/libnm-client-public/nm-client.h +++ b/src/libnm-client-public/nm-client.h @@ -8,7 +8,7 @@ #define __NM_CLIENT_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-types.h" diff --git a/src/libnm-client-public/nm-device-6lowpan.h b/src/libnm-client-public/nm-device-6lowpan.h index d46e6db4..2388bf38 100644 --- a/src/libnm-client-public/nm-device-6lowpan.h +++ b/src/libnm-client-public/nm-device-6lowpan.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_6LOWPAN_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" diff --git a/src/libnm-client-public/nm-device-adsl.h b/src/libnm-client-public/nm-device-adsl.h index 92eaf369..fa8a1278 100644 --- a/src/libnm-client-public/nm-device-adsl.h +++ b/src/libnm-client-public/nm-device-adsl.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_ADSL_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" diff --git a/src/libnm-client-public/nm-device-bond.h b/src/libnm-client-public/nm-device-bond.h index 91c023a4..19e0e046 100644 --- a/src/libnm-client-public/nm-device-bond.h +++ b/src/libnm-client-public/nm-device-bond.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_BOND_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" @@ -37,7 +37,9 @@ GType nm_device_bond_get_type(void); NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) const char *nm_device_bond_get_hw_address(NMDeviceBond *device); -gboolean nm_device_bond_get_carrier(NMDeviceBond *device); +gboolean nm_device_bond_get_carrier(NMDeviceBond *device); + +NM_DEPRECATED_IN_1_34_FOR(nm_device_get_ports) const GPtrArray *nm_device_bond_get_slaves(NMDeviceBond *device); G_END_DECLS 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 diff --git a/src/libnm-client-public/nm-device-bt.h b/src/libnm-client-public/nm-device-bt.h index a7cfc796..c277bae9 100644 --- a/src/libnm-client-public/nm-device-bt.h +++ b/src/libnm-client-public/nm-device-bt.h @@ -8,7 +8,7 @@ #define __NM_DEVICE_BT_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" diff --git a/src/libnm-client-public/nm-device-dummy.h b/src/libnm-client-public/nm-device-dummy.h index ad34b65e..d5b8cb24 100644 --- a/src/libnm-client-public/nm-device-dummy.h +++ b/src/libnm-client-public/nm-device-dummy.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_DUMMY_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" diff --git a/src/libnm-client-public/nm-device-ethernet.h b/src/libnm-client-public/nm-device-ethernet.h index 877930e6..636e5eb5 100644 --- a/src/libnm-client-public/nm-device-ethernet.h +++ b/src/libnm-client-public/nm-device-ethernet.h @@ -8,7 +8,7 @@ #define __NM_DEVICE_ETHERNET_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" diff --git a/src/libnm-client-public/nm-device-generic.h b/src/libnm-client-public/nm-device-generic.h index 5c1f3084..7b543b2f 100644 --- a/src/libnm-client-public/nm-device-generic.h +++ b/src/libnm-client-public/nm-device-generic.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_GENERIC_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" diff --git a/src/libnm-client-public/nm-device-infiniband.h b/src/libnm-client-public/nm-device-infiniband.h index be9a26e5..3999b2d5 100644 --- a/src/libnm-client-public/nm-device-infiniband.h +++ b/src/libnm-client-public/nm-device-infiniband.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_INFINIBAND_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" diff --git a/src/libnm-client-public/nm-device-ip-tunnel.h b/src/libnm-client-public/nm-device-ip-tunnel.h index 0d9c3e55..d7912729 100644 --- a/src/libnm-client-public/nm-device-ip-tunnel.h +++ b/src/libnm-client-public/nm-device-ip-tunnel.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_IP_TUNNEL_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" diff --git a/src/libnm-client-public/nm-device-macsec.h b/src/libnm-client-public/nm-device-macsec.h index 5a036601..e468344f 100644 --- a/src/libnm-client-public/nm-device-macsec.h +++ b/src/libnm-client-public/nm-device-macsec.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_MACSEC_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" diff --git a/src/libnm-client-public/nm-device-macvlan.h b/src/libnm-client-public/nm-device-macvlan.h index b8d27066..ec7eb640 100644 --- a/src/libnm-client-public/nm-device-macvlan.h +++ b/src/libnm-client-public/nm-device-macvlan.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_MACVLAN_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" diff --git a/src/libnm-client-public/nm-device-modem.h b/src/libnm-client-public/nm-device-modem.h index eced137a..f9dfc348 100644 --- a/src/libnm-client-public/nm-device-modem.h +++ b/src/libnm-client-public/nm-device-modem.h @@ -8,7 +8,7 @@ #define __NM_DEVICE_MODEM_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" diff --git a/src/libnm-client-public/nm-device-olpc-mesh.h b/src/libnm-client-public/nm-device-olpc-mesh.h index d8b835fa..86ac2ce7 100644 --- a/src/libnm-client-public/nm-device-olpc-mesh.h +++ b/src/libnm-client-public/nm-device-olpc-mesh.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_OLPC_MESH_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" diff --git a/src/libnm-client-public/nm-device-ovs-bridge.h b/src/libnm-client-public/nm-device-ovs-bridge.h index 50754e11..f0ef1547 100644 --- a/src/libnm-client-public/nm-device-ovs-bridge.h +++ b/src/libnm-client-public/nm-device-ovs-bridge.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_OVS_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" diff --git a/src/libnm-client-public/nm-device-ovs-interface.h b/src/libnm-client-public/nm-device-ovs-interface.h index 6767ad4a..12b30a75 100644 --- a/src/libnm-client-public/nm-device-ovs-interface.h +++ b/src/libnm-client-public/nm-device-ovs-interface.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_OVS_INTERFACE_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" diff --git a/src/libnm-client-public/nm-device-ovs-port.h b/src/libnm-client-public/nm-device-ovs-port.h index 1f69641b..170067f9 100644 --- a/src/libnm-client-public/nm-device-ovs-port.h +++ b/src/libnm-client-public/nm-device-ovs-port.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_OVS_PORT_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" diff --git a/src/libnm-client-public/nm-device-ppp.h b/src/libnm-client-public/nm-device-ppp.h index 7bd282d7..ff99d9f9 100644 --- a/src/libnm-client-public/nm-device-ppp.h +++ b/src/libnm-client-public/nm-device-ppp.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_PPP_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 G_BEGIN_DECLS diff --git a/src/libnm-client-public/nm-device-team.h b/src/libnm-client-public/nm-device-team.h index 921353b6..eab5e4e6 100644 --- a/src/libnm-client-public/nm-device-team.h +++ b/src/libnm-client-public/nm-device-team.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_TEAM_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" diff --git a/src/libnm-client-public/nm-device-tun.h b/src/libnm-client-public/nm-device-tun.h index ee7342de..cc05b0c1 100644 --- a/src/libnm-client-public/nm-device-tun.h +++ b/src/libnm-client-public/nm-device-tun.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_TUN_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" diff --git a/src/libnm-client-public/nm-device-veth.h b/src/libnm-client-public/nm-device-veth.h index 689762a7..41b41915 100644 --- a/src/libnm-client-public/nm-device-veth.h +++ b/src/libnm-client-public/nm-device-veth.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_VETH_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" diff --git a/src/libnm-client-public/nm-device-vlan.h b/src/libnm-client-public/nm-device-vlan.h index 81430509..c3920586 100644 --- a/src/libnm-client-public/nm-device-vlan.h +++ b/src/libnm-client-public/nm-device-vlan.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_VLAN_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" diff --git a/src/libnm-client-public/nm-device-vrf.h b/src/libnm-client-public/nm-device-vrf.h index f835dd2f..3b59023a 100644 --- a/src/libnm-client-public/nm-device-vrf.h +++ b/src/libnm-client-public/nm-device-vrf.h @@ -4,7 +4,7 @@ #define __NM_DEVICE_VRF_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" diff --git a/src/libnm-client-public/nm-device-vxlan.h b/src/libnm-client-public/nm-device-vxlan.h index 9ef5eb2d..5264e9ca 100644 --- a/src/libnm-client-public/nm-device-vxlan.h +++ b/src/libnm-client-public/nm-device-vxlan.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_VXLAN_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" diff --git a/src/libnm-client-public/nm-device-wifi-p2p.h b/src/libnm-client-public/nm-device-wifi-p2p.h index 374ef4bd..3395ca29 100644 --- a/src/libnm-client-public/nm-device-wifi-p2p.h +++ b/src/libnm-client-public/nm-device-wifi-p2p.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_WIFI_P2P_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" diff --git a/src/libnm-client-public/nm-device-wifi.h b/src/libnm-client-public/nm-device-wifi.h index bf712bbc..85062f51 100644 --- a/src/libnm-client-public/nm-device-wifi.h +++ b/src/libnm-client-public/nm-device-wifi.h @@ -8,7 +8,7 @@ #define __NM_DEVICE_WIFI_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" diff --git a/src/libnm-client-public/nm-device-wimax.h b/src/libnm-client-public/nm-device-wimax.h index 8a0fd901..123b95b2 100644 --- a/src/libnm-client-public/nm-device-wimax.h +++ b/src/libnm-client-public/nm-device-wimax.h @@ -8,7 +8,7 @@ #define __NM_DEVICE_WIMAX_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" diff --git a/src/libnm-client-public/nm-device-wireguard.h b/src/libnm-client-public/nm-device-wireguard.h index f54695ee..4a18bd81 100644 --- a/src/libnm-client-public/nm-device-wireguard.h +++ b/src/libnm-client-public/nm-device-wireguard.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_WIREGUARD_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" diff --git a/src/libnm-client-public/nm-device-wpan.h b/src/libnm-client-public/nm-device-wpan.h index 7d50fd9e..b8a7a3bf 100644 --- a/src/libnm-client-public/nm-device-wpan.h +++ b/src/libnm-client-public/nm-device-wpan.h @@ -7,7 +7,7 @@ #define __NM_DEVICE_WPAN_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" diff --git a/src/libnm-client-public/nm-device.h b/src/libnm-client-public/nm-device.h index 62baac92..23b1a805 100644 --- a/src/libnm-client-public/nm-device.h +++ b/src/libnm-client-public/nm-device.h @@ -8,7 +8,7 @@ #define __NM_DEVICE_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-object.h" @@ -57,6 +57,7 @@ _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY #define NM_DEVICE_IP6_CONNECTIVITY "ip6-connectivity" #define NM_DEVICE_INTERFACE_FLAGS "interface-flags" #define NM_DEVICE_HW_ADDRESS "hw-address" +#define NM_DEVICE_PORTS "ports" /** * NMDevice: @@ -141,6 +142,9 @@ const char * nm_device_get_hw_address(NMDevice *device); NMDeviceCapabilities nm_device_get_capabilities(NMDevice *device); gboolean nm_device_get_managed(NMDevice *device); +NM_AVAILABLE_IN_1_34 +const GPtrArray *nm_device_get_ports(NMDevice *device); + NM_AVAILABLE_IN_1_2 NM_DEPRECATED_IN_1_22 _NM_DEPRECATED_SYNC_METHOD diff --git a/src/libnm-client-public/nm-dhcp-config.h b/src/libnm-client-public/nm-dhcp-config.h index 7663fb9a..0188f9c2 100644 --- a/src/libnm-client-public/nm-dhcp-config.h +++ b/src/libnm-client-public/nm-dhcp-config.h @@ -8,7 +8,7 @@ #define __NM_DHCP_CONFIG_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-object.h" diff --git a/src/libnm-client-public/nm-ip-config.h b/src/libnm-client-public/nm-ip-config.h index bdfebb6a..a63dea67 100644 --- a/src/libnm-client-public/nm-ip-config.h +++ b/src/libnm-client-public/nm-ip-config.h @@ -8,7 +8,7 @@ #define __NM_IP_CONFIG_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-object.h" diff --git a/src/libnm-client-public/nm-object.h b/src/libnm-client-public/nm-object.h index 7b4a3232..efa3aa53 100644 --- a/src/libnm-client-public/nm-object.h +++ b/src/libnm-client-public/nm-object.h @@ -8,7 +8,7 @@ #define __NM_OBJECT_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-types.h" @@ -22,7 +22,8 @@ G_BEGIN_DECLS #define NM_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_OBJECT)) #define NM_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_OBJECT, NMObjectClass)) -#define NM_OBJECT_PATH "path" +#define NM_OBJECT_PATH "path" +#define NM_OBJECT_CLIENT "client" /** * NMObject: diff --git a/src/libnm-client-public/nm-remote-connection.h b/src/libnm-client-public/nm-remote-connection.h index e29bf073..06088e86 100644 --- a/src/libnm-client-public/nm-remote-connection.h +++ b/src/libnm-client-public/nm-remote-connection.h @@ -8,7 +8,7 @@ #define __NM_REMOTE_CONNECTION_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-object.h" diff --git a/src/libnm-client-public/nm-vpn-connection.h b/src/libnm-client-public/nm-vpn-connection.h index aac259d5..1a20d0af 100644 --- a/src/libnm-client-public/nm-vpn-connection.h +++ b/src/libnm-client-public/nm-vpn-connection.h @@ -8,7 +8,7 @@ #define __NM_VPN_CONNECTION_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-active-connection.h" diff --git a/src/libnm-client-public/nm-vpn-editor.h b/src/libnm-client-public/nm-vpn-editor.h index 8cd7805f..f89617a8 100644 --- a/src/libnm-client-public/nm-vpn-editor.h +++ b/src/libnm-client-public/nm-vpn-editor.h @@ -8,7 +8,7 @@ #define __NM_VPN_EDITOR_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 <glib.h> diff --git a/src/libnm-client-public/nm-vpn-service-plugin.h b/src/libnm-client-public/nm-vpn-service-plugin.h index e45622aa..916ea52a 100644 --- a/src/libnm-client-public/nm-vpn-service-plugin.h +++ b/src/libnm-client-public/nm-vpn-service-plugin.h @@ -8,7 +8,7 @@ #define __NM_VPN_SERVICE_PLUGIN_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 <gio/gio.h> diff --git a/src/libnm-client-public/nm-wifi-p2p-peer.h b/src/libnm-client-public/nm-wifi-p2p-peer.h index 4ab7c0e6..73e6995c 100644 --- a/src/libnm-client-public/nm-wifi-p2p-peer.h +++ b/src/libnm-client-public/nm-wifi-p2p-peer.h @@ -7,7 +7,7 @@ #define __NM_WIFI_P2P_PEER_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-object.h" diff --git a/src/libnm-client-public/nm-wimax-nsp.h b/src/libnm-client-public/nm-wimax-nsp.h index 15b8daa0..f19272db 100644 --- a/src/libnm-client-public/nm-wimax-nsp.h +++ b/src/libnm-client-public/nm-wimax-nsp.h @@ -8,7 +8,7 @@ #define __NM_WIMAX_NSP_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-object.h" |