diff --git a/Makefile.am b/Makefile.am index e78c646f0e5f2c63d7476f289ffc3195d4c91f4f..b0aa6235f545e3c9b990d9c550212dcd1ba30b9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -180,6 +180,7 @@ libnma_gtk4_c_gen = \ src/libnma-gtk4/nma-resources.c libnma_h_pub = \ + src/nma.h \ src/nma-version.h \ src/nma-wifi-dialog.h \ src/nma-mobile-wizard.h \ @@ -319,6 +320,7 @@ src_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0 src_NMA_1_0_gir_EXPORT_PACKAGES = libnma src_NMA_1_0_gir_CFLAGS = $(src_libnma_la_CFLAGS) src_NMA_1_0_gir_LIBS = src/libnma.la +src_NMA_1_0_gir_C_INCLUDES = nma.h src_NMA_1_0_gir_FILES = \ $(libnma_h_pub) \ $(libnma_c_real) @@ -532,6 +534,7 @@ src_NMA4_1_0_gir_INCLUDES = NM-1.0 Gtk-4.0 src_NMA4_1_0_gir_EXPORT_PACKAGES = libnma-gtk4 src_NMA4_1_0_gir_CFLAGS = $(src_libnma_gtk4_la_CFLAGS) src_NMA4_1_0_gir_LIBS = src/libnma-gtk4.la +src_NMA4_1_0_gir_C_INCLUDES = nma.h src_NMA4_1_0_gir_FILES = \ $(libnma_h_pub) \ $(libnma_c_real) diff --git a/src/meson.build b/src/meson.build index 052619036a2160d3711f5f9a5caf29e283b50e48..da0300aa5257a0ebbd72518b3f96db7d52079632 100644 --- a/src/meson.build +++ b/src/meson.build @@ -33,6 +33,7 @@ built_sources = gnome.compile_resources( ) gir_headers = nma_ws_headers + files( + 'nma.h', 'nma-bar-code-widget.h', 'nma-bar-code.h', 'nma-cert-chooser.h', @@ -231,6 +232,7 @@ if enable_introspection sources: gir_sources + gir_headers, nsversion: nma_gir_version, namespace: 'NMA', + header: 'nma.h', includes: [ 'Gtk-3.0', 'NM-1.0' ], identifier_prefix: nma_gir_prefix, symbol_prefix: nma_gir_prefix.to_lower(), @@ -246,6 +248,7 @@ if enable_introspection sources: gir_sources + gir_headers, nsversion: nma_gir_version, namespace: 'NMA4', + header: 'nma.h', includes: [ 'Gtk-4.0', 'NM-1.0' ], identifier_prefix: nma_gir_prefix, symbol_prefix: nma_gir_prefix.to_lower(), diff --git a/src/nma-bar-code-widget.h b/src/nma-bar-code-widget.h index 42e2148273d1c7fc378f57edcf1863a36a990bd7..d222858669e30162b38f806477a6ac0afbc27a3f 100644 --- a/src/nma-bar-code-widget.h +++ b/src/nma-bar-code-widget.h @@ -18,7 +18,10 @@ #ifndef __NMA_BAR_CODE_WIDGET_H__ #define __NMA_BAR_CODE_WIDGET_H__ +#include +#include #include +#include #include "nma-version.h" diff --git a/src/nma-cert-chooser.h b/src/nma-cert-chooser.h index 3dfeb627d7a767e70d30750e6cde7e4ab0c20730..8953db1291a429d5fdc1a1cb00bec3ec0fe1dd4c 100644 --- a/src/nma-cert-chooser.h +++ b/src/nma-cert-chooser.h @@ -10,6 +10,8 @@ #define __NMA_CERT_CHOOSER_H__ #include +#include +#include #include #include "nma-version.h" diff --git a/src/nma-ws/nma-eap-fast.h b/src/nma-ws/nma-eap-fast.h index a63d97075e821fe7bdc65bdaae0c16b7b0e1d082..569b3dac61bc8f7f9c37e241ae097ce73abc64dd 100644 --- a/src/nma-ws/nma-eap-fast.h +++ b/src/nma-ws/nma-eap-fast.h @@ -8,6 +8,9 @@ #ifndef NMA_EAP_FAST_H #define NMA_EAP_FAST_H +#include +#include + #include "nma-ws.h" typedef struct _NMAEapFast NMAEapFast; diff --git a/src/nma-ws/nma-eap-leap.h b/src/nma-ws/nma-eap-leap.h index c75aa56a447afb7cf665c85f9624198afb48a3c0..5abafbdfe404d117c032145c4c46895505d00b44 100644 --- a/src/nma-ws/nma-eap-leap.h +++ b/src/nma-ws/nma-eap-leap.h @@ -8,6 +8,9 @@ #ifndef NMA_EAP_LEAP_H #define NMA_EAP_LEAP_H +#include +#include + #include "nma-ws.h" typedef struct _NMAEapLeap NMAEapLeap; diff --git a/src/nma-ws/nma-eap-peap.h b/src/nma-ws/nma-eap-peap.h index 9f6c4a1ed58fb251d45417c42068e5e1617dd7c3..44747a272f358f8becf9bcc26ae613f6b216b6a5 100644 --- a/src/nma-ws/nma-eap-peap.h +++ b/src/nma-ws/nma-eap-peap.h @@ -8,6 +8,9 @@ #ifndef NMA_EAP_PEAP_H #define NMA_EAP_PEAP_H +#include +#include + #include "nma-ws.h" typedef struct _NMAEapPeap NMAEapPeap; diff --git a/src/nma-ws/nma-eap-simple.h b/src/nma-ws/nma-eap-simple.h index 82024dca1cf452a6be8a0e05e44024aec4991626..8655ad85113697dd25c1b64df0418d707f4a18b8 100644 --- a/src/nma-ws/nma-eap-simple.h +++ b/src/nma-ws/nma-eap-simple.h @@ -8,6 +8,9 @@ #ifndef NMA_EAP_SIMPLE_H #define NMA_EAP_SIMPLE_H +#include +#include + #include "nma-ws.h" typedef enum { diff --git a/src/nma-ws/nma-eap-tls.h b/src/nma-ws/nma-eap-tls.h index 5de3081404fcb8b6c2dff98bb4ecf29c51154f50..b1684b16e853068f165c471c5358a623b010f5c8 100644 --- a/src/nma-ws/nma-eap-tls.h +++ b/src/nma-ws/nma-eap-tls.h @@ -8,6 +8,9 @@ #ifndef NMA_EAP_TLS_H #define NMA_EAP_TLS_H +#include +#include + #include "nma-ws-802-1x.h" typedef struct _NMAEapTls NMAEapTls; diff --git a/src/nma-ws/nma-eap-ttls.h b/src/nma-ws/nma-eap-ttls.h index 1e0723365ee9b4c250ac6ba906901a171dabca6c..7d9ebb03a0508140fda87e0c95695ae0203047cc 100644 --- a/src/nma-ws/nma-eap-ttls.h +++ b/src/nma-ws/nma-eap-ttls.h @@ -8,6 +8,9 @@ #ifndef NMA_EAP_TTLS_H #define NMA_EAP_TTLS_H +#include +#include + #include "nma-ws.h" typedef struct _NMAEapTtls NMAEapTtls; diff --git a/src/nma-ws/nma-eap.h b/src/nma-ws/nma-eap.h index db5c84a0d9cbff72d3022e4228f4b6176128c597..32bf502a621c65352a34bc7a9af461b8ed9a07bc 100644 --- a/src/nma-ws/nma-eap.h +++ b/src/nma-ws/nma-eap.h @@ -8,6 +8,11 @@ #ifndef NMA_EAP_H #define NMA_EAP_H +#include +#include +#include +#include + typedef struct _NMAEap NMAEap; typedef void (*NMAEapAddToSizeGroupFunc) (NMAEap *method, GtkSizeGroup *group); diff --git a/src/nma-ws/nma-ws-802-1x-private.h b/src/nma-ws/nma-ws-802-1x-private.h index 0b20214a083a2b429e7861778413439dbff992ba..ebf9e89e916d1b9056d4d7bb45dbb9ad814f4055 100644 --- a/src/nma-ws/nma-ws-802-1x-private.h +++ b/src/nma-ws/nma-ws-802-1x-private.h @@ -6,6 +6,11 @@ #ifndef NMA_WS_802_1X_PRIVATE_H #define NMA_WS_802_1X_PRIVATE_H +#include +#include + +#include + struct _NMAWs8021xClass { GtkGridClass parent; }; diff --git a/src/nma-ws/nma-ws-802-1x.h b/src/nma-ws/nma-ws-802-1x.h index f0cbb5274b5ba76c58f256d5c3c42f897b681cb2..a8a5110b69bca435fb212cb90e2ee5fe070135c4 100644 --- a/src/nma-ws/nma-ws-802-1x.h +++ b/src/nma-ws/nma-ws-802-1x.h @@ -6,6 +6,11 @@ #ifndef NMA_WS_802_1X_H #define NMA_WS_802_1X_H +#include +#include + +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws-dynamic-wep.h b/src/nma-ws/nma-ws-dynamic-wep.h index c7b8b71ce49cb719dd4a0d57f43bcd2290d0539e..0f249a2c2fb05796e306f7b43ae601b6373cce71 100644 --- a/src/nma-ws/nma-ws-dynamic-wep.h +++ b/src/nma-ws/nma-ws-dynamic-wep.h @@ -8,6 +8,10 @@ #ifndef NMA_WS_DYNAMIC_WEP_H #define NMA_WS_DYNAMIC_WEP_H +#include +#include +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws-helpers.h b/src/nma-ws/nma-ws-helpers.h index 3f8426467a14ba0a76121921ef4800236d4908ee..18103169d7bcb477233118bed1db2ff67dcc89f4 100644 --- a/src/nma-ws/nma-ws-helpers.h +++ b/src/nma-ws/nma-ws-helpers.h @@ -8,6 +8,12 @@ #ifndef _NMA_WS_HELPERS_H_ #define _NMA_WS_HELPERS_H_ + +#include +#include +#include +#include + typedef const char * (*HelperSecretFunc)(NMSetting *); void nma_ws_helper_fill_secret_entry (NMConnection *connection, diff --git a/src/nma-ws/nma-ws-leap.h b/src/nma-ws/nma-ws-leap.h index 3e35d4473bd5cfe9b9db7fa8879900ceb558870f..23c78729388a8f6a19e5f5afc6319e31b8efe799 100644 --- a/src/nma-ws/nma-ws-leap.h +++ b/src/nma-ws/nma-ws-leap.h @@ -8,6 +8,10 @@ #ifndef NMA_WS_LEAP_H #define NMA_WS_LEAP_H +#include +#include +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws-owe.h b/src/nma-ws/nma-ws-owe.h index b178651c116eb7b941d2dbfa3f16e96dc0e94741..8ef3d0d07352fdc864103b6bdef4f4203c179f39 100644 --- a/src/nma-ws/nma-ws-owe.h +++ b/src/nma-ws/nma-ws-owe.h @@ -1,6 +1,10 @@ #ifndef NMA_WS_OWE_H #define NMA_WS_OWE_H +#include +#include +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws-private.h b/src/nma-ws/nma-ws-private.h index a3a34d78900d4c341de0a3e61d2c29a7c5564a9e..e9bccec8494a905e41efe56c2cd6f780c665b516 100644 --- a/src/nma-ws/nma-ws-private.h +++ b/src/nma-ws/nma-ws-private.h @@ -8,6 +8,12 @@ #ifndef NMA_WS_PRIVATE_H #define NMA_WS_PRIVATE_H +#include +#include +#include + +#include + struct _NMAWsInterface { GTypeInterface parent; diff --git a/src/nma-ws/nma-ws-sae.h b/src/nma-ws/nma-ws-sae.h index fae77d89880aad49a3b02e093f2f06a804297cc5..01cc9b1f42523f4e1cab83af814bf9ea6a1521f3 100644 --- a/src/nma-ws/nma-ws-sae.h +++ b/src/nma-ws/nma-ws-sae.h @@ -6,6 +6,11 @@ #ifndef NMA_WS_SAE_H #define NMA_WS_SAE_H +#include +#include + +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws-wep-key.h b/src/nma-ws/nma-ws-wep-key.h index 191aedadd8fefae34e66738bd1653c56acff0c81..abde97f7ac7c99ae3518e61e2b0a74531a386006 100644 --- a/src/nma-ws/nma-ws-wep-key.h +++ b/src/nma-ws/nma-ws-wep-key.h @@ -8,6 +8,10 @@ #ifndef NMA_WS_WEP_KEY_H #define NMA_WS_WEP_KEY_H +#include +#include +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws-wpa-eap.h b/src/nma-ws/nma-ws-wpa-eap.h index d054f45f5970206736d0dfbefb12231f902b4b3d..27bd5178d5f56d50f114677161e403ad0c7cde74 100644 --- a/src/nma-ws/nma-ws-wpa-eap.h +++ b/src/nma-ws/nma-ws-wpa-eap.h @@ -8,6 +8,10 @@ #ifndef NMA_WS_WPA_EAP_H #define NMA_WS_WPA_EAP_H +#include +#include +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws-wpa-psk.h b/src/nma-ws/nma-ws-wpa-psk.h index aca5d5df9a878d7c826b887b9fd6f5cb2073b0a6..8d62c2b26b4e86b7dd5b314d4fa55965c5ddfa5f 100644 --- a/src/nma-ws/nma-ws-wpa-psk.h +++ b/src/nma-ws/nma-ws-wpa-psk.h @@ -8,6 +8,10 @@ #ifndef NMA_WS_WPA_PSK_H #define NMA_WS_WPA_PSK_H +#include +#include +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma-ws/nma-ws.h b/src/nma-ws/nma-ws.h index 93bf28022b80ac20b0d98f5d5cb1bce93dadd9fe..df7f736f347d1da2e340fe7dd3c60a13a9d55294 100644 --- a/src/nma-ws/nma-ws.h +++ b/src/nma-ws/nma-ws.h @@ -8,6 +8,12 @@ #ifndef NMA_WS_H #define NMA_WS_H +#include +#include +#include + +#include + #include "nma-version.h" G_BEGIN_DECLS diff --git a/src/nma.h b/src/nma.h new file mode 100644 index 0000000000000000000000000000000000000000..48a1c258117237a9f334e90cb56c28431f049516 --- /dev/null +++ b/src/nma.h @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: LGPL-2.1+ +/* NetworkManager Applet -- allow user control over networking + * + * Corentin Noël + * + * Copyright 2023 Collabora, Ltd. + */ + +#ifndef __NMA_H__ +#define __NMA_H__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* __NMA_H__ */