diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2022-05-06 18:50:26 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-05-06 18:50:26 +0200 |
commit | 6525e8a7d7e081cfec911c33b036a9145f5f8672 (patch) | |
tree | f2dc9f6cf765e12cd2d96c13b0cf704ed1556777 | |
parent | 53cfb30bebd82dae7bf0e04eb1e719f3fb8b3d11 (diff) | |
parent | 99d92e2f10561903d494b94fe28296491159b071 (diff) |
merge: branch 'lr/gtkdoc'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1211
59 files changed, 95 insertions, 142 deletions
diff --git a/Makefile.am b/Makefile.am index ba86583542..a9f028dcf9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1691,7 +1691,6 @@ libnm_lib_h_pub_real = \ src/libnm-client-public/nm-object.h \ src/libnm-client-public/nm-remote-connection.h \ src/libnm-client-public/nm-secret-agent-old.h \ - src/libnm-client-public/nm-types.h \ src/libnm-client-public/nm-vpn-connection.h \ src/libnm-client-public/nm-vpn-editor.h \ src/libnm-client-public/nm-vpn-plugin-old.h \ diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index b18f47be32..f7bd2db545 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -20,6 +20,7 @@ #include "nm-checkpoint.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-helpers.h" +#include "nm-wifi-p2p-peer.h" #include "nm-device-6lowpan.h" #include "nm-device-adsl.h" #include "nm-device-bond.h" @@ -33,7 +34,6 @@ #include "nm-device-macsec.h" #include "nm-device-macvlan.h" #include "nm-device-modem.h" -#include "nm-device-olpc-mesh.h" #include "nm-device-ovs-bridge.h" #include "nm-device-ovs-interface.h" #include "nm-device-ovs-port.h" @@ -46,6 +46,7 @@ #include "nm-device-wifi.h" #include "nm-device-wireguard.h" #include "nm-device-wpan.h" +#include "nm-device-olpc-mesh.h" #include "nm-dhcp-config.h" #include "nm-dhcp4-config.h" #include "nm-dhcp6-config.h" @@ -56,7 +57,6 @@ #include "nm-remote-connection.h" #include "nm-utils.h" #include "nm-vpn-connection.h" -#include "nm-wifi-p2p-peer.h" /*****************************************************************************/ @@ -8399,9 +8399,9 @@ nm_client_class_init(NMClientClass *client_class) * * Whether a connectivity checking service has been enabled. * - * Since: 1.10 - * * The property setter is a synchronous D-Bus call. This is deprecated since 1.22. + * + * Since: 1.10 */ obj_properties[PROP_CONNECTIVITY_CHECK_ENABLED] = g_param_spec_boolean(NM_CLIENT_CONNECTIVITY_CHECK_ENABLED, @@ -8729,7 +8729,7 @@ nm_client_class_init(NMClientClass *client_class) G_TYPE_UINT); /** * NMClient::connection-added: - * @client: the settings object that received the signal + * @client: the client that received the signal * @connection: the new connection * * Notifies that a #NMConnection has been added. @@ -8747,7 +8747,7 @@ nm_client_class_init(NMClientClass *client_class) /** * NMClient::connection-removed: - * @client: the settings object that received the signal + * @client: the client that received the signal * @connection: the removed connection * * Notifies that a #NMConnection has been removed. @@ -8765,7 +8765,7 @@ nm_client_class_init(NMClientClass *client_class) /** * NMClient::active-connection-added: - * @client: the settings object that received the signal + * @client: the client that received the signal * @active_connection: the new active connection * * Notifies that a #NMActiveConnection has been added. @@ -8783,7 +8783,7 @@ nm_client_class_init(NMClientClass *client_class) /** * NMClient::active-connection-removed: - * @client: the settings object that received the signal + * @client: the client that received the signal * @active_connection: the removed active connection * * Notifies that a #NMActiveConnection has been removed. diff --git a/src/libnm-client-impl/nm-default-libnm.h b/src/libnm-client-impl/nm-default-libnm.h index 5b3a8e5179..859766a301 100644 --- a/src/libnm-client-impl/nm-default-libnm.h +++ b/src/libnm-client-impl/nm-default-libnm.h @@ -16,6 +16,16 @@ /*****************************************************************************/ #include "nm-version.h" +#include "nm-dbus-interface.h" +#include "nm-dhcp-config.h" +#include "nm-ip-config.h" +#include "nm-connection.h" +#include "nm-remote-connection.h" +#include "nm-active-connection.h" +#include "nm-device.h" +#include "nm-checkpoint.h" +#include "nm-client.h" +#include "nm-vpn-connection.h" #include "nm-libnm-utils.h" /*****************************************************************************/ diff --git a/src/libnm-client-impl/nm-device-macvlan.c b/src/libnm-client-impl/nm-device-macvlan.c index a8363c930c..be6d56e44c 100644 --- a/src/libnm-client-impl/nm-device-macvlan.c +++ b/src/libnm-client-impl/nm-device-macvlan.c @@ -120,11 +120,11 @@ nm_device_macvlan_get_tap(NMDeviceMacvlan *device) * Returns: the hardware address. This is the internal string used by the * device, and must not be modified. * - * Since: 1.2 - * * This property is not implemented yet, and the function always return NULL. * * Deprecated: 1.24: Use nm_device_get_hw_address() instead. + * + * Since: 1.2 **/ const char * nm_device_macvlan_get_hw_address(NMDeviceMacvlan *device) diff --git a/src/libnm-client-impl/nm-device-olpc-mesh.c b/src/libnm-client-impl/nm-device-olpc-mesh.c index 26fceb3bd5..38f9e472c8 100644 --- a/src/libnm-client-impl/nm-device-olpc-mesh.c +++ b/src/libnm-client-impl/nm-device-olpc-mesh.c @@ -5,12 +5,13 @@ #include "libnm-client-impl/nm-default-libnm.h" +#include "nm-access-point.h" +#include "nm-device-wifi.h" #include "nm-device-olpc-mesh.h" #include "nm-setting-connection.h" #include "nm-setting-olpc-mesh.h" #include "nm-object-private.h" -#include "nm-device-wifi.h" /*****************************************************************************/ diff --git a/src/libnm-client-impl/nm-device-vxlan.c b/src/libnm-client-impl/nm-device-vxlan.c index d7bd9cbe94..d81b551601 100644 --- a/src/libnm-client-impl/nm-device-vxlan.c +++ b/src/libnm-client-impl/nm-device-vxlan.c @@ -96,10 +96,10 @@ nm_device_vxlan_get_hw_address(NMDeviceVxlan *device) * * Returns: %TRUE if the device has carrier. * - * Since: 1.2 - * * This property is not implemented yet, and the function always returns * FALSE. + * + * Since: 1.2 **/ gboolean nm_device_vxlan_get_carrier(NMDeviceVxlan *device) @@ -541,9 +541,9 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass) * * Whether the device has carrier. * - * Since: 1.2 - * * This property is not implemented yet, and the property is always FALSE. + * + * Since: 1.2 **/ obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_VXLAN_CARRIER, "", diff --git a/src/libnm-client-impl/nm-device-wifi-p2p.c b/src/libnm-client-impl/nm-device-wifi-p2p.c index fb72f25052..6e667ac61a 100644 --- a/src/libnm-client-impl/nm-device-wifi-p2p.c +++ b/src/libnm-client-impl/nm-device-wifi-p2p.c @@ -5,13 +5,13 @@ #include "libnm-client-impl/nm-default-libnm.h" +#include "nm-wifi-p2p-peer.h" #include "nm-device-wifi-p2p.h" #include "libnm-glib-aux/nm-dbus-aux.h" #include "nm-setting-connection.h" #include "nm-setting-wifi-p2p.h" #include "nm-utils.h" -#include "nm-wifi-p2p-peer.h" #include "nm-object-private.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-helpers.h" diff --git a/src/libnm-client-impl/nm-device-wifi.c b/src/libnm-client-impl/nm-device-wifi.c index b062ea9e04..616aca5008 100644 --- a/src/libnm-client-impl/nm-device-wifi.c +++ b/src/libnm-client-impl/nm-device-wifi.c @@ -6,6 +6,7 @@ #include "libnm-client-impl/nm-default-libnm.h" +#include "nm-access-point.h" #include "nm-device-wifi.h" #include <linux/if_ether.h> @@ -15,7 +16,6 @@ #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" #include "nm-utils.h" -#include "nm-access-point.h" #include "nm-object-private.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-helpers.h" diff --git a/src/libnm-client-impl/nm-device-wimax.c b/src/libnm-client-impl/nm-device-wimax.c index b9db20bb67..cdbe7fbc2f 100644 --- a/src/libnm-client-impl/nm-device-wimax.c +++ b/src/libnm-client-impl/nm-device-wimax.c @@ -6,9 +6,8 @@ #include "libnm-client-impl/nm-default-libnm.h" -#include "nm-device-wimax.h" - #include "nm-wimax-nsp.h" +#include "nm-device-wimax.h" /*****************************************************************************/ diff --git a/src/libnm-client-impl/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h index db5f31ea5a..9d9cfa2530 100644 --- a/src/libnm-client-impl/nm-libnm-utils.h +++ b/src/libnm-client-impl/nm-libnm-utils.h @@ -7,12 +7,8 @@ #define __NM_LIBNM_UTILS_H__ #include "c-list/src/c-list.h" -#include "nm-device.h" #include "libnm-glib-aux/nm-ref-string.h" #include "libnm-glib-aux/nm-logging-fwd.h" -#include "nm-types.h" -#include "nm-object.h" -#include "nm-client.h" /*****************************************************************************/ diff --git a/src/libnm-client-public/NetworkManager.h b/src/libnm-client-public/NetworkManager.h index 66f676a111..a1e7f78f56 100644 --- a/src/libnm-client-public/NetworkManager.h +++ b/src/libnm-client-public/NetworkManager.h @@ -8,12 +8,21 @@ #define __NETWORKMANAGER_H_INSIDE__ -#include "nm-access-point.h" +#include <gio/gio.h> + +#include "nm-version.h" +#include "nm-dbus-interface.h" +#include "nm-dhcp-config.h" +#include "nm-ip-config.h" +#include "nm-remote-connection.h" #include "nm-active-connection.h" -#include "nm-client.h" +#include "nm-checkpoint.h" #include "nm-connection.h" +#include "nm-client.h" +#include "nm-access-point.h" #include "nm-core-enum-types.h" -#include "nm-dbus-interface.h" +#include "nm-wifi-p2p-peer.h" +#include "nm-wimax-nsp.h" #include "nm-device-6lowpan.h" #include "nm-device-adsl.h" #include "nm-device-bond.h" @@ -27,7 +36,6 @@ #include "nm-device-macsec.h" #include "nm-device-macvlan.h" #include "nm-device-modem.h" -#include "nm-device-olpc-mesh.h" #include "nm-device-ovs-bridge.h" #include "nm-device-ovs-interface.h" #include "nm-device-ovs-port.h" @@ -37,19 +45,17 @@ #include "nm-device-veth.h" #include "nm-device-vlan.h" #include "nm-device-vxlan.h" -#include "nm-device-wifi-p2p.h" #include "nm-device-wifi.h" +#include "nm-device-wifi-p2p.h" +#include "nm-device-olpc-mesh.h" #include "nm-device-wimax.h" #include "nm-device-wireguard.h" #include "nm-device-wpan.h" #include "nm-device.h" -#include "nm-dhcp-config.h" #include "nm-enum-types.h" #include "nm-ethtool-utils.h" -#include "nm-ip-config.h" #include "nm-keyfile.h" #include "nm-object.h" -#include "nm-remote-connection.h" #include "nm-setting-6lowpan.h" #include "nm-setting-8021x.h" #include "nm-setting-adsl.h" @@ -105,15 +111,12 @@ #include "nm-setting.h" #include "nm-simple-connection.h" #include "nm-utils.h" -#include "nm-version.h" #include "nm-vpn-connection.h" #include "nm-vpn-dbus-interface.h" #include "nm-vpn-editor.h" #include "nm-vpn-editor-plugin.h" #include "nm-vpn-plugin-info.h" #include "nm-vpn-service-plugin.h" -#include "nm-wifi-p2p-peer.h" -#include "nm-wimax-nsp.h" #include "nm-autoptr.h" diff --git a/src/libnm-client-public/meson.build b/src/libnm-client-public/meson.build index 3ae4e8d83f..f76fd1868f 100644 --- a/src/libnm-client-public/meson.build +++ b/src/libnm-client-public/meson.build @@ -45,7 +45,6 @@ libnm_client_headers = files( 'nm-object.h', 'nm-remote-connection.h', 'nm-secret-agent-old.h', - 'nm-types.h', 'nm-vpn-connection.h', 'nm-vpn-editor.h', 'nm-vpn-plugin-old.h', diff --git a/src/libnm-client-public/nm-access-point.h b/src/libnm-client-public/nm-access-point.h index 9f9216bb59..5a78e34f73 100644 --- a/src/libnm-client-public/nm-access-point.h +++ b/src/libnm-client-public/nm-access-point.h @@ -42,6 +42,7 @@ G_BEGIN_DECLS /** * NMAccessPoint: */ +typedef struct _NMAccessPoint NMAccessPoint; typedef struct _NMAccessPointClass NMAccessPointClass; GType nm_access_point_get_type(void); diff --git a/src/libnm-client-public/nm-active-connection.h b/src/libnm-client-public/nm-active-connection.h index a65b4f20f7..5aba2fff74 100644 --- a/src/libnm-client-public/nm-active-connection.h +++ b/src/libnm-client-public/nm-active-connection.h @@ -43,9 +43,12 @@ G_BEGIN_DECLS #define NM_ACTIVE_CONNECTION_VPN "vpn" #define NM_ACTIVE_CONNECTION_MASTER "master" +typedef struct _NMDevice NMDevice; + /** * NMActiveConnection: */ +typedef struct _NMActiveConnection NMActiveConnection; typedef struct _NMActiveConnectionClass NMActiveConnectionClass; GType nm_active_connection_get_type(void); diff --git a/src/libnm-client-public/nm-checkpoint.h b/src/libnm-client-public/nm-checkpoint.h index def1f5544c..456d7f6bdc 100644 --- a/src/libnm-client-public/nm-checkpoint.h +++ b/src/libnm-client-public/nm-checkpoint.h @@ -30,6 +30,7 @@ G_BEGIN_DECLS /** * NMCheckpoint: */ +typedef struct _NMCheckpoint NMCheckpoint; typedef struct _NMCheckpointClass NMCheckpointClass; GType nm_checkpoint_get_type(void); diff --git a/src/libnm-client-public/nm-client.h b/src/libnm-client-public/nm-client.h index 2e3e77c43c..6307f11217 100644 --- a/src/libnm-client-public/nm-client.h +++ b/src/libnm-client-public/nm-client.h @@ -11,8 +11,6 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-types.h" - G_BEGIN_DECLS /** @@ -148,6 +146,7 @@ gboolean nm_dns_entry_get_vpn(NMDnsEntry *entry); * D-Bus signals gets processed and the #NMClient instance updates and * emits #GObject signals. */ +typedef struct _NMClient NMClient; typedef struct _NMClientClass NMClientClass; GType nm_client_get_type(void); diff --git a/src/libnm-client-public/nm-device-6lowpan.h b/src/libnm-client-public/nm-device-6lowpan.h index 2388bf3816..d5f8a7a5c1 100644 --- a/src/libnm-client-public/nm-device-6lowpan.h +++ b/src/libnm-client-public/nm-device-6lowpan.h @@ -30,6 +30,7 @@ G_BEGIN_DECLS /** * NMDevice6Lowpan: */ +typedef struct _NMDevice6Lowpan NMDevice6Lowpan; typedef struct _NMDevice6LowpanClass NMDevice6LowpanClass; NM_AVAILABLE_IN_1_14 diff --git a/src/libnm-client-public/nm-device-adsl.h b/src/libnm-client-public/nm-device-adsl.h index fa8a127899..a4fbec51db 100644 --- a/src/libnm-client-public/nm-device-adsl.h +++ b/src/libnm-client-public/nm-device-adsl.h @@ -28,6 +28,7 @@ G_BEGIN_DECLS /** * NMDeviceAdsl: */ +typedef struct _NMDeviceAdsl NMDeviceAdsl; typedef struct _NMDeviceAdslClass NMDeviceAdslClass; GType nm_device_adsl_get_type(void); diff --git a/src/libnm-client-public/nm-device-bond.h b/src/libnm-client-public/nm-device-bond.h index 19e0e04638..6edc6106f6 100644 --- a/src/libnm-client-public/nm-device-bond.h +++ b/src/libnm-client-public/nm-device-bond.h @@ -30,6 +30,7 @@ G_BEGIN_DECLS /** * NMDeviceBond: */ +typedef struct _NMDeviceBond NMDeviceBond; typedef struct _NMDeviceBondClass NMDeviceBondClass; GType nm_device_bond_get_type(void); diff --git a/src/libnm-client-public/nm-device-bridge.h b/src/libnm-client-public/nm-device-bridge.h index 07905195b7..e37400221b 100644 --- a/src/libnm-client-public/nm-device-bridge.h +++ b/src/libnm-client-public/nm-device-bridge.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS /** * NMDeviceBridge: */ +typedef struct _NMDeviceBridge NMDeviceBridge; typedef struct _NMDeviceBridgeClass NMDeviceBridgeClass; GType nm_device_bridge_get_type(void); diff --git a/src/libnm-client-public/nm-device-bt.h b/src/libnm-client-public/nm-device-bt.h index c277bae99b..fa8d730815 100644 --- a/src/libnm-client-public/nm-device-bt.h +++ b/src/libnm-client-public/nm-device-bt.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS /** * NMDeviceBt: */ +typedef struct _NMDeviceBt NMDeviceBt; typedef struct _NMDeviceBtClass NMDeviceBtClass; GType nm_device_bt_get_type(void); diff --git a/src/libnm-client-public/nm-device-dummy.h b/src/libnm-client-public/nm-device-dummy.h index d5b8cb2428..8b2f748577 100644 --- a/src/libnm-client-public/nm-device-dummy.h +++ b/src/libnm-client-public/nm-device-dummy.h @@ -29,6 +29,7 @@ G_BEGIN_DECLS /** * NMDeviceDummy: */ +typedef struct _NMDeviceDummy NMDeviceDummy; typedef struct _NMDeviceDummyClass NMDeviceDummyClass; GType nm_device_dummy_get_type(void); diff --git a/src/libnm-client-public/nm-device-ethernet.h b/src/libnm-client-public/nm-device-ethernet.h index 636e5eb57a..828865c7f9 100644 --- a/src/libnm-client-public/nm-device-ethernet.h +++ b/src/libnm-client-public/nm-device-ethernet.h @@ -35,6 +35,7 @@ G_BEGIN_DECLS /** * NMDeviceEthernet: */ +typedef struct _NMDeviceEthernet NMDeviceEthernet; typedef struct _NMDeviceEthernetClass NMDeviceEthernetClass; GType nm_device_ethernet_get_type(void); diff --git a/src/libnm-client-public/nm-device-generic.h b/src/libnm-client-public/nm-device-generic.h index 7b543b2ff6..ff24c6f10c 100644 --- a/src/libnm-client-public/nm-device-generic.h +++ b/src/libnm-client-public/nm-device-generic.h @@ -30,6 +30,7 @@ G_BEGIN_DECLS /** * NMDeviceGeneric: */ +typedef struct _NMDeviceGeneric NMDeviceGeneric; typedef struct _NMDeviceGenericClass NMDeviceGenericClass; GType nm_device_generic_get_type(void); diff --git a/src/libnm-client-public/nm-device-infiniband.h b/src/libnm-client-public/nm-device-infiniband.h index 3999b2d560..53b16176ec 100644 --- a/src/libnm-client-public/nm-device-infiniband.h +++ b/src/libnm-client-public/nm-device-infiniband.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS /** * NMDeviceInfiniband: */ +typedef struct _NMDeviceInfiniband NMDeviceInfiniband; typedef struct _NMDeviceInfinibandClass NMDeviceInfinibandClass; GType nm_device_infiniband_get_type(void); diff --git a/src/libnm-client-public/nm-device-ip-tunnel.h b/src/libnm-client-public/nm-device-ip-tunnel.h index d79127298b..4f55dc0bd4 100644 --- a/src/libnm-client-public/nm-device-ip-tunnel.h +++ b/src/libnm-client-public/nm-device-ip-tunnel.h @@ -42,6 +42,7 @@ G_BEGIN_DECLS /** * NMDeviceIPTunnel: */ +typedef struct _NMDeviceIPTunnel NMDeviceIPTunnel; typedef struct _NMDeviceIPTunnelClass NMDeviceIPTunnelClass; NM_AVAILABLE_IN_1_2 diff --git a/src/libnm-client-public/nm-device-macsec.h b/src/libnm-client-public/nm-device-macsec.h index e468344fbb..b1ec363713 100644 --- a/src/libnm-client-public/nm-device-macsec.h +++ b/src/libnm-client-public/nm-device-macsec.h @@ -42,6 +42,7 @@ G_BEGIN_DECLS /** * NMDeviceMacsec: */ +typedef struct _NMDeviceMacsec NMDeviceMacsec; typedef struct _NMDeviceMacsecClass NMDeviceMacsecClass; NM_AVAILABLE_IN_1_6 diff --git a/src/libnm-client-public/nm-device-macvlan.h b/src/libnm-client-public/nm-device-macvlan.h index ec7eb640a7..9569933418 100644 --- a/src/libnm-client-public/nm-device-macvlan.h +++ b/src/libnm-client-public/nm-device-macvlan.h @@ -33,6 +33,7 @@ G_BEGIN_DECLS /** * NMDeviceMacvlan: */ +typedef struct _NMDeviceMacvlan NMDeviceMacvlan; typedef struct _NMDeviceMacvlanClass NMDeviceMacvlanClass; NM_AVAILABLE_IN_1_2 diff --git a/src/libnm-client-public/nm-device-modem.h b/src/libnm-client-public/nm-device-modem.h index f9dfc34815..4ef175728a 100644 --- a/src/libnm-client-public/nm-device-modem.h +++ b/src/libnm-client-public/nm-device-modem.h @@ -34,6 +34,7 @@ G_BEGIN_DECLS /** * NMDeviceModem: */ +typedef struct _NMDeviceModem NMDeviceModem; typedef struct _NMDeviceModemClass NMDeviceModemClass; GType nm_device_modem_get_type(void); diff --git a/src/libnm-client-public/nm-device-olpc-mesh.h b/src/libnm-client-public/nm-device-olpc-mesh.h index 86ac2ce706..ea3a309619 100644 --- a/src/libnm-client-public/nm-device-olpc-mesh.h +++ b/src/libnm-client-public/nm-device-olpc-mesh.h @@ -32,6 +32,7 @@ G_BEGIN_DECLS /** * NMDeviceOlpcMesh: */ +typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh; typedef struct _NMDeviceOlpcMeshClass NMDeviceOlpcMeshClass; GType nm_device_olpc_mesh_get_type(void); diff --git a/src/libnm-client-public/nm-device-ovs-bridge.h b/src/libnm-client-public/nm-device-ovs-bridge.h index f0ef154728..8c45405776 100644 --- a/src/libnm-client-public/nm-device-ovs-bridge.h +++ b/src/libnm-client-public/nm-device-ovs-bridge.h @@ -30,6 +30,7 @@ G_BEGIN_DECLS /** * NMDeviceOvsBridge: */ +typedef struct _NMDeviceOvsBridge NMDeviceOvsBridge; typedef struct _NMDeviceOvsBridgeClass NMDeviceOvsBridgeClass; NM_AVAILABLE_IN_1_10 diff --git a/src/libnm-client-public/nm-device-ovs-interface.h b/src/libnm-client-public/nm-device-ovs-interface.h index 12b30a75b5..1ba7ac3a4c 100644 --- a/src/libnm-client-public/nm-device-ovs-interface.h +++ b/src/libnm-client-public/nm-device-ovs-interface.h @@ -29,6 +29,7 @@ G_BEGIN_DECLS /** * NMDeviceOvsInterface: */ +typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface; typedef struct _NMDeviceOvsInterfaceClass NMDeviceOvsInterfaceClass; NM_AVAILABLE_IN_1_10 diff --git a/src/libnm-client-public/nm-device-ovs-port.h b/src/libnm-client-public/nm-device-ovs-port.h index 170067f9cc..7524cacb55 100644 --- a/src/libnm-client-public/nm-device-ovs-port.h +++ b/src/libnm-client-public/nm-device-ovs-port.h @@ -30,6 +30,7 @@ G_BEGIN_DECLS /** * NMDeviceOvsPort: */ +typedef struct _NMDeviceOvsPort NMDeviceOvsPort; typedef struct _NMDeviceOvsPortClass NMDeviceOvsPortClass; NM_AVAILABLE_IN_1_10 diff --git a/src/libnm-client-public/nm-device-ppp.h b/src/libnm-client-public/nm-device-ppp.h index ff99d9f974..4003f901c8 100644 --- a/src/libnm-client-public/nm-device-ppp.h +++ b/src/libnm-client-public/nm-device-ppp.h @@ -24,6 +24,7 @@ G_BEGIN_DECLS /** * NMDevicePpp: */ +typedef struct _NMDevicePpp NMDevicePpp; typedef struct _NMDevicePppClass NMDevicePppClass; GType nm_device_ppp_get_type(void); diff --git a/src/libnm-client-public/nm-device-team.h b/src/libnm-client-public/nm-device-team.h index eab5e4e6b4..406949a109 100644 --- a/src/libnm-client-public/nm-device-team.h +++ b/src/libnm-client-public/nm-device-team.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS /** * NMDeviceTeam: */ +typedef struct _NMDeviceTeam NMDeviceTeam; typedef struct _NMDeviceTeamClass NMDeviceTeamClass; GType nm_device_team_get_type(void); diff --git a/src/libnm-client-public/nm-device-tun.h b/src/libnm-client-public/nm-device-tun.h index cc05b0c16f..e1e7310d37 100644 --- a/src/libnm-client-public/nm-device-tun.h +++ b/src/libnm-client-public/nm-device-tun.h @@ -34,6 +34,7 @@ G_BEGIN_DECLS /** * NMDeviceTun: */ +typedef struct _NMDeviceTun NMDeviceTun; typedef struct _NMDeviceTunClass NMDeviceTunClass; NM_AVAILABLE_IN_1_2 diff --git a/src/libnm-client-public/nm-device-veth.h b/src/libnm-client-public/nm-device-veth.h index 41b419156e..8f61ae2052 100644 --- a/src/libnm-client-public/nm-device-veth.h +++ b/src/libnm-client-public/nm-device-veth.h @@ -28,6 +28,7 @@ G_BEGIN_DECLS /** * NMDeviceVeth: */ +typedef struct _NMDeviceVeth NMDeviceVeth; typedef struct _NMDeviceVethClass NMDeviceVethClass; NM_AVAILABLE_IN_1_30 diff --git a/src/libnm-client-public/nm-device-vlan.h b/src/libnm-client-public/nm-device-vlan.h index c392058695..c74453fdbd 100644 --- a/src/libnm-client-public/nm-device-vlan.h +++ b/src/libnm-client-public/nm-device-vlan.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS /** * NMDeviceVlan: */ +typedef struct _NMDeviceVlan NMDeviceVlan; typedef struct _NMDeviceVlanClass NMDeviceVlanClass; GType nm_device_vlan_get_type(void); diff --git a/src/libnm-client-public/nm-device-vrf.h b/src/libnm-client-public/nm-device-vrf.h index 3b59023acc..fbc8b20224 100644 --- a/src/libnm-client-public/nm-device-vrf.h +++ b/src/libnm-client-public/nm-device-vrf.h @@ -25,6 +25,7 @@ G_BEGIN_DECLS /** * NMDeviceVrf: */ +typedef struct _NMDeviceVrf NMDeviceVrf; typedef struct _NMDeviceVrfClass NMDeviceVrfClass; NM_AVAILABLE_IN_1_24 diff --git a/src/libnm-client-public/nm-device-vxlan.h b/src/libnm-client-public/nm-device-vxlan.h index 5264e9caf5..7939539d61 100644 --- a/src/libnm-client-public/nm-device-vxlan.h +++ b/src/libnm-client-public/nm-device-vxlan.h @@ -46,6 +46,7 @@ G_BEGIN_DECLS /** * NMDeviceVxlan: */ +typedef struct _NMDeviceVxlan NMDeviceVxlan; typedef struct _NMDeviceVxlanClass NMDeviceVxlanClass; NM_AVAILABLE_IN_1_2 diff --git a/src/libnm-client-public/nm-device-wifi-p2p.h b/src/libnm-client-public/nm-device-wifi-p2p.h index cf68b496b9..ad0ca43664 100644 --- a/src/libnm-client-public/nm-device-wifi-p2p.h +++ b/src/libnm-client-public/nm-device-wifi-p2p.h @@ -34,6 +34,7 @@ G_BEGIN_DECLS * * Since: 1.16 */ +typedef struct _NMDeviceWifiP2P NMDeviceWifiP2P; typedef struct _NMDeviceWifiP2PClass NMDeviceWifiP2PClass; NM_AVAILABLE_IN_1_16 diff --git a/src/libnm-client-public/nm-device-wifi.h b/src/libnm-client-public/nm-device-wifi.h index 1c767316ae..287b792e80 100644 --- a/src/libnm-client-public/nm-device-wifi.h +++ b/src/libnm-client-public/nm-device-wifi.h @@ -36,6 +36,7 @@ G_BEGIN_DECLS /** * NMDeviceWifi: */ +typedef struct _NMDeviceWifi NMDeviceWifi; typedef struct _NMDeviceWifiClass NMDeviceWifiClass; GType nm_device_wifi_get_type(void); diff --git a/src/libnm-client-public/nm-device-wimax.h b/src/libnm-client-public/nm-device-wimax.h index 123b95b26c..e62288192c 100644 --- a/src/libnm-client-public/nm-device-wimax.h +++ b/src/libnm-client-public/nm-device-wimax.h @@ -39,6 +39,7 @@ G_BEGIN_DECLS * * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0. */ +typedef struct _NMDeviceWimax NMDeviceWimax; typedef struct _NMDeviceWimaxClass NMDeviceWimaxClass; NM_DEPRECATED_IN_1_2 diff --git a/src/libnm-client-public/nm-device-wireguard.h b/src/libnm-client-public/nm-device-wireguard.h index 4a18bd8117..756dfb4e46 100644 --- a/src/libnm-client-public/nm-device-wireguard.h +++ b/src/libnm-client-public/nm-device-wireguard.h @@ -28,6 +28,7 @@ G_BEGIN_DECLS /** * NMDeviceWireGuard: */ +typedef struct _NMDeviceWireGuard NMDeviceWireGuard; typedef struct _NMDeviceWireGuardClass NMDeviceWireGuardClass; #define NM_DEVICE_WIREGUARD_PUBLIC_KEY "public-key" diff --git a/src/libnm-client-public/nm-device-wpan.h b/src/libnm-client-public/nm-device-wpan.h index b8a7a3bf85..8b011851b1 100644 --- a/src/libnm-client-public/nm-device-wpan.h +++ b/src/libnm-client-public/nm-device-wpan.h @@ -28,6 +28,7 @@ G_BEGIN_DECLS /** * NMDeviceWpan: */ +typedef struct _NMDeviceWpan NMDeviceWpan; typedef struct _NMDeviceWpanClass NMDeviceWpanClass; NM_AVAILABLE_IN_1_14 diff --git a/src/libnm-client-public/nm-device.h b/src/libnm-client-public/nm-device.h index 9e9dbea64d..f58d3ddba8 100644 --- a/src/libnm-client-public/nm-device.h +++ b/src/libnm-client-public/nm-device.h @@ -62,6 +62,7 @@ _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY /** * NMDevice: */ +typedef struct _NMDevice NMDevice; typedef struct _NMDeviceClass NMDeviceClass; /** diff --git a/src/libnm-client-public/nm-dhcp-config.h b/src/libnm-client-public/nm-dhcp-config.h index 0188f9c23e..625efb5844 100644 --- a/src/libnm-client-public/nm-dhcp-config.h +++ b/src/libnm-client-public/nm-dhcp-config.h @@ -25,6 +25,7 @@ G_BEGIN_DECLS /** * NMDhcpConfig: */ +typedef struct _NMDhcpConfig NMDhcpConfig; typedef struct _NMDhcpConfigClass NMDhcpConfigClass; #define NM_DHCP_CONFIG_FAMILY "family" diff --git a/src/libnm-client-public/nm-enum-types.c.template b/src/libnm-client-public/nm-enum-types.c.template index c2627f447d..5d693fe3e6 100644 --- a/src/libnm-client-public/nm-enum-types.c.template +++ b/src/libnm-client-public/nm-enum-types.c.template @@ -5,45 +5,9 @@ #include "nm-version-macros.h" #include "NetworkManager.h" -#include "nm-access-point.h" -#include "nm-active-connection.h" -#include "nm-checkpoint.h" -#include "nm-client.h" -#include "nm-device-adsl.h" -#include "nm-device-bond.h" -#include "nm-device-bridge.h" -#include "nm-device-bt.h" -#include "nm-device-dummy.h" -#include "nm-device-ethernet.h" -#include "nm-device-generic.h" -#include "nm-device-infiniband.h" -#include "nm-device-ip-tunnel.h" -#include "nm-device-macsec.h" -#include "nm-device-macvlan.h" -#include "nm-device-modem.h" -#include "nm-device-olpc-mesh.h" -#include "nm-device-ovs-interface.h" -#include "nm-device-ovs-port.h" -#include "nm-device-ovs-bridge.h" -#include "nm-device-ppp.h" -#include "nm-device-team.h" -#include "nm-device-tun.h" -#include "nm-device-vlan.h" -#include "nm-device-vxlan.h" -#include "nm-device-wifi.h" -#include "nm-device-wimax.h" -#include "nm-device.h" -#include "nm-dhcp-config.h" -#include "nm-ip-config.h" -#include "nm-object.h" -#include "nm-remote-connection.h" -#include "nm-types.h" -#include "nm-vpn-connection.h" -#include "nm-vpn-editor.h" -#include "nm-wimax-nsp.h" #include "nm-secret-agent-old.h" #include "nm-vpn-plugin-old.h" -#include "nm-vpn-service-plugin.h" + /*** END file-header ***/ /*** BEGIN value-header ***/ diff --git a/src/libnm-client-public/nm-ip-config.h b/src/libnm-client-public/nm-ip-config.h index 99b1948dbe..9ad15d30dc 100644 --- a/src/libnm-client-public/nm-ip-config.h +++ b/src/libnm-client-public/nm-ip-config.h @@ -27,6 +27,7 @@ G_BEGIN_DECLS /** * NMIPConfig: */ +typedef struct _NMIPConfig NMIPConfig; typedef struct _NMIPConfigClass NMIPConfigClass; #define NM_IP_CONFIG_FAMILY "family" diff --git a/src/libnm-client-public/nm-object.h b/src/libnm-client-public/nm-object.h index efa3aa536a..5b3b8b1350 100644 --- a/src/libnm-client-public/nm-object.h +++ b/src/libnm-client-public/nm-object.h @@ -11,8 +11,6 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include "nm-types.h" - G_BEGIN_DECLS #define NM_TYPE_OBJECT (nm_object_get_type()) @@ -25,9 +23,12 @@ G_BEGIN_DECLS #define NM_OBJECT_PATH "path" #define NM_OBJECT_CLIENT "client" +typedef struct _NMClient NMClient; + /** * NMObject: */ +typedef struct _NMObject NMObject; typedef struct _NMObjectClass NMObjectClass; GType nm_object_get_type(void); diff --git a/src/libnm-client-public/nm-remote-connection.h b/src/libnm-client-public/nm-remote-connection.h index 6104ecb817..f00b25d613 100644 --- a/src/libnm-client-public/nm-remote-connection.h +++ b/src/libnm-client-public/nm-remote-connection.h @@ -37,6 +37,7 @@ G_BEGIN_DECLS /** * NMRemoteConnection: */ +typedef struct _NMRemoteConnection NMRemoteConnection; typedef struct _NMRemoteConnectionClass NMRemoteConnectionClass; GType nm_remote_connection_get_type(void); diff --git a/src/libnm-client-public/nm-secret-agent-old.h b/src/libnm-client-public/nm-secret-agent-old.h index b45b12bb6a..ca7bfa4cc9 100644 --- a/src/libnm-client-public/nm-secret-agent-old.h +++ b/src/libnm-client-public/nm-secret-agent-old.h @@ -6,8 +6,6 @@ #ifndef __NM_SECRET_AGENT_OLD_H__ #define __NM_SECRET_AGENT_OLD_H__ -#include "nm-types.h" - G_BEGIN_DECLS #define NM_TYPE_SECRET_AGENT_OLD (nm_secret_agent_old_get_type()) diff --git a/src/libnm-client-public/nm-types.h b/src/libnm-client-public/nm-types.h deleted file mode 100644 index 81ffe790d5..0000000000 --- a/src/libnm-client-public/nm-types.h +++ /dev/null @@ -1,56 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2014 - 2018 Red Hat, Inc. - */ - -#ifndef __NM_TYPES_H__ -#define __NM_TYPES_H__ - -#include <gio/gio.h> - -#include "nm-dbus-interface.h" -#include "nm-connection.h" - -typedef struct _NMAccessPoint NMAccessPoint; -typedef struct _NMActiveConnection NMActiveConnection; -typedef struct _NMCheckpoint NMCheckpoint; -typedef struct _NMClient NMClient; -typedef struct _NMDevice NMDevice; -typedef struct _NMDevice6Lowpan NMDevice6Lowpan; -typedef struct _NMDeviceAdsl NMDeviceAdsl; -typedef struct _NMDeviceBond NMDeviceBond; -typedef struct _NMDeviceBridge NMDeviceBridge; -typedef struct _NMDeviceBt NMDeviceBt; -typedef struct _NMDeviceDummy NMDeviceDummy; -typedef struct _NMDeviceEthernet NMDeviceEthernet; -typedef struct _NMDeviceGeneric NMDeviceGeneric; -typedef struct _NMDeviceIPTunnel NMDeviceIPTunnel; -typedef struct _NMDeviceInfiniband NMDeviceInfiniband; -typedef struct _NMDeviceMacsec NMDeviceMacsec; -typedef struct _NMDeviceMacvlan NMDeviceMacvlan; -typedef struct _NMDeviceModem NMDeviceModem; -typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh; -typedef struct _NMDeviceOvsBridge NMDeviceOvsBridge; -typedef struct _NMDeviceOvsInterface NMDeviceOvsInterface; -typedef struct _NMDeviceOvsPort NMDeviceOvsPort; -typedef struct _NMDevicePpp NMDevicePpp; -typedef struct _NMDeviceTeam NMDeviceTeam; -typedef struct _NMDeviceTun NMDeviceTun; -typedef struct _NMDeviceVeth NMDeviceVeth; -typedef struct _NMDeviceVlan NMDeviceVlan; -typedef struct _NMDeviceVrf NMDeviceVrf; -typedef struct _NMDeviceVxlan NMDeviceVxlan; -typedef struct _NMDeviceWifi NMDeviceWifi; -typedef struct _NMDeviceWifiP2P NMDeviceWifiP2P; -typedef struct _NMDeviceWimax NMDeviceWimax; -typedef struct _NMDeviceWireGuard NMDeviceWireGuard; -typedef struct _NMDeviceWpan NMDeviceWpan; -typedef struct _NMDhcpConfig NMDhcpConfig; -typedef struct _NMIPConfig NMIPConfig; -typedef struct _NMObject NMObject; -typedef struct _NMRemoteConnection NMRemoteConnection; -typedef struct _NMVpnConnection NMVpnConnection; -typedef struct _NMWifiP2PPeer NMWifiP2PPeer; -typedef struct _NMWimaxNsp NMWimaxNsp; - -#endif /* NM_TYPES_H */ diff --git a/src/libnm-client-public/nm-vpn-connection.h b/src/libnm-client-public/nm-vpn-connection.h index 33ca139d20..578c033349 100644 --- a/src/libnm-client-public/nm-vpn-connection.h +++ b/src/libnm-client-public/nm-vpn-connection.h @@ -32,6 +32,7 @@ G_BEGIN_DECLS /** * NMVpnConnection: */ +typedef struct _NMVpnConnection NMVpnConnection; typedef struct _NMVpnConnectionClass NMVpnConnectionClass; GType nm_vpn_connection_get_type(void); diff --git a/src/libnm-client-public/nm-vpn-editor.h b/src/libnm-client-public/nm-vpn-editor.h index f89617a897..9c4facb2b1 100644 --- a/src/libnm-client-public/nm-vpn-editor.h +++ b/src/libnm-client-public/nm-vpn-editor.h @@ -13,7 +13,6 @@ #include <glib.h> #include <glib-object.h> -#include "nm-types.h" #include "nm-vpn-editor-plugin.h" diff --git a/src/libnm-client-public/nm-wifi-p2p-peer.h b/src/libnm-client-public/nm-wifi-p2p-peer.h index 73e6995cd2..eff27bcbb9 100644 --- a/src/libnm-client-public/nm-wifi-p2p-peer.h +++ b/src/libnm-client-public/nm-wifi-p2p-peer.h @@ -38,6 +38,7 @@ G_BEGIN_DECLS /** * NMWifiP2PPeer: */ +typedef struct _NMWifiP2PPeer NMWifiP2PPeer; typedef struct _NMWifiP2PPeerClass NMWifiP2PPeerClass; NM_AVAILABLE_IN_1_16 diff --git a/src/libnm-client-public/nm-wimax-nsp.h b/src/libnm-client-public/nm-wimax-nsp.h index f19272db5a..9cd4153ccb 100644 --- a/src/libnm-client-public/nm-wimax-nsp.h +++ b/src/libnm-client-public/nm-wimax-nsp.h @@ -33,6 +33,7 @@ G_BEGIN_DECLS * * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0. */ +typedef struct _NMWimaxNsp NMWimaxNsp; typedef struct _NMWimaxNspClass NMWimaxNspClass; GType nm_wimax_nsp_get_type(void); diff --git a/src/libnm-core-impl/nm-setting-ethtool.c b/src/libnm-core-impl/nm-setting-ethtool.c index 49c0d78097..71179efd39 100644 --- a/src/libnm-core-impl/nm-setting-ethtool.c +++ b/src/libnm-core-impl/nm-setting-ethtool.c @@ -45,11 +45,11 @@ get_variant_type_from_ethtool_id(NMEthtoolID ethtool_id) * * %Returns: %TRUE, if @optname is valid * - * Since: 1.20 - * * Note that nm_ethtool_optname_is_feature() was first added to the libnm header files * in 1.14.0 but forgot to actually add to the library. This happened belatedly in 1.20.0 and * the stable versions 1.18.2, 1.16.4 and 1.14.8 (with linker version "libnm_1_14_8"). + * + * Since: 1.20 */ gboolean nm_ethtool_optname_is_feature(const char *optname) diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index cffd5b19ff..25c2dc5d4a 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -2481,10 +2481,10 @@ nm_ip_routing_rule_set_suppress_prefixlength(NMIPRoutingRule *self, gint32 suppr * * Returns: %TRUE if a uid range is set. * - * Since: 1.34 - * * This API was wrongly introduced in the header files for 1.32, but the * symbols were not exported. The API only works since 1.34 and newer. + * + * Since: 1.34 */ gboolean nm_ip_routing_rule_get_uid_range(const NMIPRoutingRule *self, @@ -2509,10 +2509,10 @@ nm_ip_routing_rule_get_uid_range(const NMIPRoutingRule *self, * For a valid range, start must be less or equal to end. * If set to an invalid range, the range gets unset. * - * Since: 1.34 - * * This API was wrongly introduced in the header files for 1.32, but the * symbols were not exported. The API only works since 1.34 and newer. + * + * Since: 1.34 */ void nm_ip_routing_rule_set_uid_range(NMIPRoutingRule *self, |