libnm: merge branch 'th/fix-libnm-includes'

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1222

3 files changed, 72 insertions, 61 deletions

diff --git a/src/libnm-client-public/NetworkManager.h b/src/libnm-client-public/NetworkManager.h
index a1e7f78f56..de3c7821ff 100644
--- a/src/libnm-client-public/NetworkManager.h
+++ b/src/libnm-client-public/NetworkManager.h
@@ -12,50 +12,15 @@
 
 #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-checkpoint.h"
-#include "nm-connection.h"
-#include "nm-client.h"
-#include "nm-access-point.h"
+
 #include "nm-core-enum-types.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"
-#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-ovs-bridge.h"
-#include "nm-device-ovs-interface.h"
-#include "nm-device-ovs-port.h"
-#include "nm-device-ppp.h"
-#include "nm-device-team.h"
-#include "nm-device-tun.h"
-#include "nm-device-veth.h"
-#include "nm-device-vlan.h"
-#include "nm-device-vxlan.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-enum-types.h"
-#include "nm-ethtool-utils.h"
+
+#include "nm-connection.h"
+#include "nm-simple-connection.h"
 #include "nm-keyfile.h"
-#include "nm-object.h"
+#include "nm-setting.h"
+#include "nm-utils.h"
+
 #include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
@@ -108,16 +73,60 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-wpan.h"
-#include "nm-setting.h"
-#include "nm-simple-connection.h"
-#include "nm-utils.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-editor-plugin.h"
+
+#include "nm-enum-types.h"
+
+#include "nm-ethtool-utils.h"
+
+#include "nm-object.h"
+#include "nm-dhcp-config.h"
+#include "nm-ip-config.h"
+#include "nm-remote-connection.h"
+#include "nm-active-connection.h"
+#include "nm-checkpoint.h"
+#include "nm-access-point.h"
+#include "nm-wifi-p2p-peer.h"
+#include "nm-wimax-nsp.h"
+#include "nm-device.h"
+#include "nm-vpn-connection.h"
+#include "nm-vpn-editor.h"
 #include "nm-vpn-service-plugin.h"
 
+#include "nm-client.h"
+
+#include "nm-device-6lowpan.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-ovs-bridge.h"
+#include "nm-device-ovs-interface.h"
+#include "nm-device-ovs-port.h"
+#include "nm-device-ppp.h"
+#include "nm-device-team.h"
+#include "nm-device-tun.h"
+#include "nm-device-veth.h"
+#include "nm-device-vlan.h"
+#include "nm-device-vxlan.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-autoptr.h"
 
 #if !defined(NETWORKMANAGER_COMPILATION) \
diff --git a/src/libnm-client-public/nm-active-connection.h b/src/libnm-client-public/nm-active-connection.h
index 5aba2fff74..5c3148269a 100644
--- a/src/libnm-client-public/nm-active-connection.h
+++ b/src/libnm-client-public/nm-active-connection.h
@@ -43,8 +43,6 @@ G_BEGIN_DECLS
 #define NM_ACTIVE_CONNECTION_VPN                  "vpn"
 #define NM_ACTIVE_CONNECTION_MASTER               "master"
 
-typedef struct _NMDevice NMDevice;
-
 /**
  * NMActiveConnection:
  */
@@ -64,14 +62,18 @@ NM_AVAILABLE_IN_1_10
 NMActivationStateFlags nm_active_connection_get_state_flags(NMActiveConnection *connection);
 NM_AVAILABLE_IN_1_8
 NMActiveConnectionStateReason nm_active_connection_get_state_reason(NMActiveConnection *connection);
-NMDevice                     *nm_active_connection_get_master(NMActiveConnection *connection);
-gboolean                      nm_active_connection_get_default(NMActiveConnection *connection);
-NMIPConfig                   *nm_active_connection_get_ip4_config(NMActiveConnection *connection);
-NMDhcpConfig                 *nm_active_connection_get_dhcp4_config(NMActiveConnection *connection);
-gboolean                      nm_active_connection_get_default6(NMActiveConnection *connection);
-NMIPConfig                   *nm_active_connection_get_ip6_config(NMActiveConnection *connection);
-NMDhcpConfig                 *nm_active_connection_get_dhcp6_config(NMActiveConnection *connection);
-gboolean                      nm_active_connection_get_vpn(NMActiveConnection *connection);
+
+struct _NMDevice;
+
+struct _NMDevice *nm_active_connection_get_master(NMActiveConnection *connection);
+
+gboolean      nm_active_connection_get_default(NMActiveConnection *connection);
+NMIPConfig   *nm_active_connection_get_ip4_config(NMActiveConnection *connection);
+NMDhcpConfig *nm_active_connection_get_dhcp4_config(NMActiveConnection *connection);
+gboolean      nm_active_connection_get_default6(NMActiveConnection *connection);
+NMIPConfig   *nm_active_connection_get_ip6_config(NMActiveConnection *connection);
+NMDhcpConfig *nm_active_connection_get_dhcp6_config(NMActiveConnection *connection);
+gboolean      nm_active_connection_get_vpn(NMActiveConnection *connection);
 
 G_END_DECLS
 
diff --git a/src/libnm-client-public/nm-object.h b/src/libnm-client-public/nm-object.h
index 5b3b8b1350..c6daf1e6ca 100644
--- a/src/libnm-client-public/nm-object.h
+++ b/src/libnm-client-public/nm-object.h
@@ -23,8 +23,6 @@ G_BEGIN_DECLS
 #define NM_OBJECT_PATH   "path"
 #define NM_OBJECT_CLIENT "client"
 
-typedef struct _NMClient NMClient;
-
 /**
  * NMObject:
  */
@@ -35,8 +33,10 @@ GType nm_object_get_type(void);
 
 const char *nm_object_get_path(NMObject *object);
 
+struct _NMClient;
+
 NM_AVAILABLE_IN_1_24
-NMClient *nm_object_get_client(NMObject *object);
+struct _NMClient *nm_object_get_client(NMObject *object);
 
 G_END_DECLS