fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 11:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: merge branch 'th/nm-default-cleanup'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/746
This commit is contained in:
Thomas Haller 2021-02-09 15:49:42 +01:00
commit 4fcdd1eb48
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
515 changed files with 2214 additions and 1307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -136,7 +136,6 @@ test-*.trs
/shared/nm-glib-aux/tests/test-json-aux
/shared/nm-glib-aux/tests/test-shared-general
/shared/nm-platform/tests/test-nm-platform
/shared/nm-version-macros.h
/introspection/org.freedesktop.NetworkManager*.[ch]
@ -149,6 +148,7 @@ test-*.trs
/libnm-core/tests/test-secrets
/libnm-core/tests/test-setting
/libnm-core/nm-dbus-types.xml
/libnm-core/nm-version-macros.h
/libnm-core/nm-vpn-dbus-types.xml
/libnm/nm-property-infos-dbus.xml
@ -349,6 +349,7 @@ test-*.trs
/policy/org.freedesktop.NetworkManager.policy
/policy/org.freedesktop.NetworkManager.policy.in
/shared/nm-utils/tests/test-shared-general
/shared/nm-version-macros.h
/src/devices/tests/test-arping
/src/devices/wifi/tests/test-general
/src/devices/wifi/tests/test-wifi-ap-utils

169
Makefile.am
View file

@ -354,7 +354,6 @@ shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \
$(CODE_COVERAGE_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION='0' \
$(NULL)
shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
@ -362,6 +361,8 @@ shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
shared/nm-std-aux/c-list-util.c \
shared/nm-std-aux/c-list-util.h \
shared/nm-std-aux/nm-dbus-compat.h \
shared/nm-std-aux/nm-default-std.h \
shared/nm-std-aux/nm-networkmanager-compilation.h \
shared/nm-std-aux/nm-std-aux.h \
shared/nm-std-aux/nm-std-utils.c \
shared/nm-std-aux/nm-std-utils.h \
@ -382,7 +383,6 @@ shared_nm_glib_aux_cppflags = \
$(SANITIZER_LIB_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
$(NULL)
noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la
@ -397,10 +397,14 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
shared/nm-glib-aux/nm-dbus-aux.h \
shared/nm-glib-aux/nm-dedup-multi.c \
shared/nm-glib-aux/nm-dedup-multi.h \
shared/nm-glib-aux/nm-default-glib-i18n-lib.h \
shared/nm-glib-aux/nm-default-glib-i18n-prog.h \
shared/nm-glib-aux/nm-default-glib.h \
shared/nm-glib-aux/nm-enum-utils.c \
shared/nm-glib-aux/nm-enum-utils.h \
shared/nm-glib-aux/nm-errno.c \
shared/nm-glib-aux/nm-errno.h \
shared/nm-glib-aux/nm-gassert-patch.h \
shared/nm-glib-aux/nm-glib.h \
shared/nm-glib-aux/nm-hash-utils.c \
shared/nm-glib-aux/nm-hash-utils.h \
@ -499,7 +503,6 @@ shared_nm_log_core_libnm_log_core_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(SYSTEMD_JOURNAL_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
$(NULL)
shared_nm_log_core_libnm_log_core_la_SOURCES = \
@ -551,8 +554,7 @@ check_programs += shared/nm-platform/tests/test-nm-platform
shared_nm_platform_tests_test_nm_platform_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
-DG_LOG_DOMAIN=\""test"\" \
$(CODE_COVERAGE_CFLAGS) \
$(SYSTEMD_JOURNAL_CFLAGS) \
$(GLIB_CFLAGS) \
@ -592,7 +594,6 @@ libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
$(NULL)
libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \
@ -630,7 +631,6 @@ libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
$(NULL)
libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \
@ -654,41 +654,6 @@ EXTRA_DIST += libnm-core/nm-libnm-core-aux/README.md
###############################################################################
noinst_LTLIBRARIES += libnm-core/nm-keyfile/libnm-keyfile.la
libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
$(CODE_COVERAGE_CFLAGS) \
$(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
$(NULL)
libnm_core_nm_keyfile_libnm_keyfile_la_SOURCES = \
libnm-core/nm-keyfile/nm-keyfile-internal.h \
libnm-core/nm-keyfile/nm-keyfile-utils.c \
libnm-core/nm-keyfile/nm-keyfile-utils.h \
libnm-core/nm-keyfile/nm-keyfile.c \
$(NULL)
libnm_core_nm_keyfile_libnm_keyfile_la_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(SANITIZER_LIB_LDFLAGS) \
$(NULL)
libnm_core_nm_keyfile_libnm_keyfile_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
$(libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
###############################################################################
noinst_LTLIBRARIES += libnm/nm-libnm-aux/libnm-libnm-aux.la
libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
@ -703,7 +668,6 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
-DG_LOG_DOMAIN=\""libnmc"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
$(NULL)
libnm_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
@ -740,8 +704,7 @@ check_programs += shared/nm-glib-aux/tests/test-shared-general
shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
-DG_LOG_DOMAIN=\""test"\" \
$(CODE_COVERAGE_CFLAGS) \
$(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
@ -769,8 +732,7 @@ check_programs += shared/nm-glib-aux/tests/test-json-aux
shared_nm_glib_aux_tests_test_json_aux_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
-DG_LOG_DOMAIN=\""test"\" \
$(CODE_COVERAGE_CFLAGS) \
$(GLIB_CFLAGS) \
$(JANSSON_CFLAGS) \
@ -1041,7 +1003,6 @@ check_local += check-docs
###############################################################################
libnm_core_lib_h_pub_real = \
shared/nm-version-macros.h \
libnm-core/nm-connection.h \
libnm-core/nm-core-types.h \
libnm-core/nm-dbus-interface.h \
@ -1102,6 +1063,7 @@ libnm_core_lib_h_pub_real = \
libnm-core/nm-setting.h \
libnm-core/nm-simple-connection.h \
libnm-core/nm-utils.h \
libnm-core/nm-version-macros.h \
libnm-core/nm-version.h \
libnm-core/nm-vpn-dbus-interface.h \
libnm-core/nm-vpn-editor-plugin.h \
@ -1111,12 +1073,16 @@ libnm_core_lib_h_pub_mkenums = \
libnm-core/nm-core-enum-types.h \
$(NULL)
libnm_core_lib_h_priv = \
shared/nm-meta-setting.h \
libnm-core/nm-connection-private.h \
libnm-core/nm-core-internal.h \
libnm-core/nm-core-types-internal.h \
libnm-core/nm-crypto-impl.h \
libnm-core/nm-crypto.h \
libnm-core/nm-default-libnm-core.h \
libnm-core/nm-keyfile-internal.h \
libnm-core/nm-keyfile-utils.h \
libnm-core/nm-meta-setting-base-impl.h \
libnm-core/nm-meta-setting-base.h \
libnm-core/nm-property-compare.h \
libnm-core/nm-setting-private.h \
libnm-core/nm-team-utils.h \
@ -1178,11 +1144,13 @@ libnm_core_lib_c_settings_real = \
$(NULL)
libnm_core_lib_c_real = \
$(libnm_core_lib_c_settings_real) \
shared/nm-meta-setting.c \
libnm-core/nm-connection.c \
libnm-core/nm-crypto.c \
libnm-core/nm-dbus-utils.c \
libnm-core/nm-errors.c \
libnm-core/nm-keyfile-utils.c \
libnm-core/nm-keyfile.c \
libnm-core/nm-meta-setting-base-impl.c \
libnm-core/nm-property-compare.c \
libnm-core/nm-setting.c \
libnm-core/nm-simple-connection.c \
@ -1222,7 +1190,7 @@ GLIB_GENERATED += \
$(libnm_core_lib_c_mkenums)
nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real)
nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n'
libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp
libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp
@ -1243,7 +1211,6 @@ $(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(li
libnm_core_libnm_core_la_CPPFLAGS = \
$(dflt_cppflags_libnm_core) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
$(NULL)
libnm_core_libnm_core_la_SOURCES = \
@ -1268,8 +1235,6 @@ libnm_core_libnm_core_la_LDFLAGS = \
EXTRA_DIST += \
libnm-core/nm-crypto-gnutls.c \
libnm-core/nm-crypto-nss.c \
libnm-core/nm-core-enum-types.c.template \
libnm-core/nm-core-enum-types.h.template \
libnm-core/meson.build \
$(NULL)
@ -1344,7 +1309,7 @@ GLIB_GENERATED += \
libnm-core/tests/nm-core-tests-enum-types.h \
libnm-core/tests/nm-core-tests-enum-types.c
nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h
nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "nm-default.h"\n'
nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n'
libnm-core/tests/nm-core-tests-enum-types.h.stamp: libnm-core/tests/.dirstamp
libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp
@ -1355,8 +1320,7 @@ libnm_core_tests_cppflags = \
-I$(srcdir)/libnm-core/tests \
-I$(builddir)/libnm-core/tests \
$(dflt_cppflags_libnm_core) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-DG_LOG_DOMAIN=\""test"\" \
$(SANITIZER_EXEC_CFLAGS) \
$(NULL)
@ -1380,7 +1344,6 @@ nodist_libnm_core_tests_test_general_SOURCES = \
libnm_core_tests_ldadd = \
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
libnm-core/nm-keyfile/libnm-keyfile.la \
libnm-core/libnm-core.la \
$(libnm_crypto_lib) \
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@ -1457,7 +1420,6 @@ EXTRA_DIST += \
###############################################################################
libnm_lib_h_pub_real = \
shared/nm-version-macros.h \
libnm/NetworkManager.h \
libnm/nm-access-point.h \
libnm/nm-active-connection.h \
@ -1510,14 +1472,16 @@ libnm_lib_h_pub_real = \
libnm_lib_h_pub_mkenums = \
libnm/nm-enum-types.h
libnm_lib_h_priv = \
libnm/nm-libnm-utils.h \
libnm/nm-dbus-helpers.h \
libnm/nm-default-client.h \
libnm/nm-default-libnm.h \
libnm/nm-device-private.h \
libnm/nm-dhcp4-config.h \
libnm/nm-dhcp6-config.h \
libnm/nm-dns-manager.h \
libnm/nm-ip4-config.h \
libnm/nm-ip6-config.h \
libnm/nm-libnm-utils.h \
libnm/nm-object-private.h \
libnm/nm-remote-connection-private.h \
$(NULL)
@ -1584,7 +1548,6 @@ libnm_lib_cppflags = \
-I$(builddir)/libnm \
$(dflt_cppflags_libnm_core) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
$(NULL)
libnminclude_HEADERS += \
@ -1613,7 +1576,6 @@ nodist_libnm_libnm_static_la_SOURCES = \
libnm_libnm_static_la_LIBADD = \
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
libnm-core/nm-keyfile/libnm-keyfile.la \
libnm-core/libnm-core.la \
$(libnm_crypto_lib) \
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@ -1645,7 +1607,7 @@ nm_enum_types_sources = \
$(libnm_lib_h_pub_mkenums) \
$(libnm_lib_h_pub_real)
nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include "nm-core-enum-types.h"\n'
nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm/nm-default-libnm.h"\n'
$(dispatcher_nm_dispatcher_OBJECTS): $(libnm_lib_h_pub_mkenums)
$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
@ -1699,7 +1661,10 @@ libnm/NM-1.0.gir: libnm/libnm.la
libnm_NM_1_0_gir_INCLUDES = Gio-2.0
libnm_NM_1_0_gir_PACKAGES = gio-2.0
libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm
libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS)
libnm_NM_1_0_gir_CFLAGS = \
$(libnm_libnm_la_CPPFLAGS) \
-DNETWORKMANAGER_COMPILATION \
$(NULL)
libnm_NM_1_0_gir_LIBS = libnm/libnm.la
libnm_NM_1_0_gir_FILES = \
$(libnm_core_lib_h_pub_mkenums) \
@ -1708,7 +1673,6 @@ libnm_NM_1_0_gir_FILES = \
$(libnm_core_lib_c_real) \
$(libnm_lib_h_pub_mkenums) \
$(libnm_lib_h_pub_real) \
libnm-core/nm-keyfile/nm-keyfile.c \
$(libnm_lib_c_mkenums) \
$(libnm_lib_c_real)
libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
@ -1777,8 +1741,6 @@ EXTRA_DIST += \
tools/generate-docs-nm-settings-docs-merge.py \
tools/generate-docs-nm-settings-docs-gir.py \
libnm/meson.build \
libnm/nm-enum-types.c.template \
libnm/nm-enum-types.h.template \
$(NULL)
###############################################################################
@ -1800,8 +1762,7 @@ libnm_tests_cppflags = \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
$(dflt_cppflags_libnm_core) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
-DG_LOG_DOMAIN=\""test"\" \
$(SANITIZER_EXEC_CFLAGS) \
$(NULL)
@ -1880,8 +1841,7 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
-I$(builddir)/libnm \
$(GLIB_CFLAGS) \
$(SANITIZER_EXEC_CFLAGS) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-DG_LOG_DOMAIN=\""test"\" \
$(NULL)
libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
@ -1898,13 +1858,12 @@ EXTRA_DIST += \
src_core_cppflags_base = \
-I$(srcdir)/src/core \
$(dflt_cppflags_libnm_core) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
$(SANITIZER_EXEC_CFLAGS) \
$(NULL)
src_core_cppflags_base_test = \
$(src_core_cppflags_base) \
-DNETWORKMANAGER_COMPILATION_TEST \
$(NULL)
src_core_cppflags_device_plugin = \
@ -1925,7 +1884,6 @@ src_core_cppflags = \
src_core_cppflags_test = \
$(src_core_cppflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
$(NULL)
if REQUIRE_ROOT_TESTS
@ -1970,7 +1928,6 @@ noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la
shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
$(libsystemd_cppflags) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
-DG_LOG_DOMAIN=\""libnm"\" \
$(NULL)
@ -1987,11 +1944,11 @@ noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la
shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
$(libsystemd_cppflags) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
-DG_LOG_DOMAIN=\""libnm"\" \
$(NULL)
shared_systemd_libnm_systemd_shared_la_SOURCES = \
shared/systemd/nm-default-systemd-shared.h \
shared/systemd/nm-sd-utils-shared.c \
shared/systemd/nm-sd-utils-shared.h \
shared/systemd/sd-adapt-shared/architecture.h \
@ -2018,7 +1975,6 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
shared/systemd/sd-adapt-shared/mkdir.h \
shared/systemd/sd-adapt-shared/namespace-util.h \
shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
shared/systemd/sd-adapt-shared/nulstr-util.h \
shared/systemd/sd-adapt-shared/raw-clone.h \
shared/systemd/sd-adapt-shared/rlimit-util.h \
@ -2137,7 +2093,7 @@ src_core_libnm_systemd_core_la_cppflags = \
-I$(srcdir)/src/core/systemd/src/systemd \
-I$(srcdir)/src/core/systemd/src/libsystemd-network \
-I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
$(NULL)
src_core_libnm_systemd_core_la_libadd = \
@ -2146,6 +2102,7 @@ src_core_libnm_systemd_core_la_libadd = \
$(NULL)
src_core_libnm_systemd_core_la_SOURCES = \
src/core/systemd/nm-default-systemd.h \
src/core/systemd/nm-sd-utils-core.c \
src/core/systemd/nm-sd-utils-core.h \
src/core/systemd/nm-sd.c \
@ -2317,6 +2274,8 @@ EXTRA_DIST += \
src_core_libNetworkManager_la_CPPFLAGS = $(src_core_cppflags)
src_core_libNetworkManager_la_SOURCES = \
\
src/core/nm-default-daemon.h \
\
src/core/nm-checkpoint.c \
src/core/nm-checkpoint.h \
@ -2496,7 +2455,6 @@ src_core_libNetworkManager_la_SOURCES = \
src_core_libNetworkManager_la_LIBADD = \
src/core/libNetworkManagerBase.la \
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
libnm-core/nm-keyfile/libnm-keyfile.la \
libnm-core/libnm-core.la \
$(libnm_crypto_lib) \
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@ -2610,7 +2568,6 @@ src_core_nm_iface_helper_SOURCES = \
src_core_nm_iface_helper_LDADD = \
src/core/libNetworkManagerBase.la \
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
libnm-core/nm-keyfile/libnm-keyfile.la \
libnm-core/libnm-core.la \
$(libnm_crypto_lib) \
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@ -2665,7 +2622,6 @@ src_core_initrd_nm_initrd_generator_LDADD = \
src/core/initrd/libnmi-core.la \
src/core/libNetworkManagerBase.la \
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
libnm-core/nm-keyfile/libnm-keyfile.la \
libnm-core/libnm-core.la \
$(libnm_crypto_lib) \
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@ -2691,13 +2647,13 @@ src_core_initrd_nm_initrd_generator_LDFLAGS = \
check_programs += src/core/initrd/tests/test-dt-reader
src_core_initrd_tests_test_dt_reader_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION_TEST \
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
$(src_core_cppflags)
$(src_core_cppflags) \
$(NULL)
src_core_initrd_tests_test_dt_reader_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(SANITIZER_EXEC_LDFLAGS)
$(SANITIZER_EXEC_LDFLAGS) \
$(NULL)
src_core_initrd_tests_test_dt_reader_LDADD = \
src/core/initrd/libnmi-core.la \
@ -2711,13 +2667,13 @@ src_core_initrd_tests_test_dt_reader_LDADD = \
check_programs += src/core/initrd/tests/test-ibft-reader
src_core_initrd_tests_test_ibft_reader_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION_TEST \
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
$(src_core_cppflags)
$(src_core_cppflags) \
$(NULL)
src_core_initrd_tests_test_ibft_reader_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(SANITIZER_EXEC_LDFLAGS)
$(SANITIZER_EXEC_LDFLAGS) \
$(NULL)
src_core_initrd_tests_test_ibft_reader_LDADD = \
src/core/initrd/libnmi-core.la \
@ -2947,9 +2903,8 @@ EXTRA_DIST += \
check_programs += src/core/initrd/tests/test-cmdline-reader
src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \
-DNETWORKMANAGER_COMPILATION_TEST \
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
$(src_core_cppflags)
$(src_core_cppflags) \
$(NULL)
src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
@ -2988,7 +2943,6 @@ src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
$(GLIB_CFLAGS) \
$(NULL)
@ -3051,7 +3005,6 @@ src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
$(GLIB_CFLAGS)
src_core_ppp_nm_pppd_plugin_la_SOURCES = \
@ -4330,7 +4283,6 @@ $(src_core_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
src_core_tests_test_systemd_CPPFLAGS = \
$(src_core_libnm_systemd_core_la_cppflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
$(NULL)
src_core_tests_test_systemd_LDFLAGS = \
@ -4391,7 +4343,6 @@ dispatcher_cppflags = \
-I$(builddir)/dispatcher \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
$(NULL)
dispatcher_libnm_dispatcher_core_la_SOURCES = \
@ -4472,8 +4423,7 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
-I$(builddir)/libnm \
-I$(srcdir)/dispatcher \
-I$(builddir)/dispatcher \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
$(GLIB_CFLAGS) \
$(SANITIZER_EXEC_CFLAGS) \
$(INTROSPECTION_EXTRA_CFLAGS) \
@ -4529,7 +4479,6 @@ clients_nm_online_CPPFLAGS = \
-I$(builddir)/libnm \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nm-online"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
$(NULL)
clients_nm_online_LDFLAGS = \
@ -4565,7 +4514,6 @@ clients_cppflags = \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
-I$(srcdir)/clients/common \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
$(GLIB_CFLAGS) \
$(SANITIZER_EXEC_CFLAGS) \
$(NULL)
@ -4625,8 +4573,9 @@ EXTRA_LTLIBRARIES += clients/common/libnmc.la
endif
clients_common_libnmc_la_SOURCES = \
shared/nm-meta-setting.c \
shared/nm-meta-setting.h \
clients/common/nm-meta-setting-base-impl.c \
clients/common/nm-meta-setting-base-impl.h \
clients/common/nm-meta-setting-base.h \
\
clients/common/nm-meta-setting-desc.c \
clients/common/nm-meta-setting-desc.h \
@ -4660,7 +4609,7 @@ endif
clients_common_tests_test_clients_common_CPPFLAGS = \
-I$(srcdir)/clients/common/tests \
$(clients_cppflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DG_LOG_DOMAIN=\""test"\" \
$(NULL)
clients_common_tests_test_clients_common_LDFLAGS = \
@ -4701,8 +4650,7 @@ clients_common_tests_test_libnm_core_aux_CPPFLAGS = \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm \
-I$(srcdir)/libnm \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-DG_LOG_DOMAIN=\""test"\" \
$(CODE_COVERAGE_CFLAGS) \
$(GLIB_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
@ -5435,8 +5383,6 @@ EXTRA_DIST += \
\
po/meson.build \
\
shared/nm-default.h \
shared/nm-gassert-patch.h \
shared/nm-test-libnm-utils.h \
shared/nm-test-utils-impl.c \
shared/nm-utils/nm-compat.c \
@ -5446,14 +5392,16 @@ EXTRA_DIST += \
shared/nm-utils/nm-vpn-plugin-macros.h \
shared/nm-utils/nm-vpn-plugin-utils.c \
shared/nm-utils/nm-vpn-plugin-utils.h \
shared/nm-version-macros.h.in \
shared/meson.build \
\
libnm-core/nm-version-macros.h.in \
\
tools/check-config-options.sh \
tools/check-docs.sh \
tools/check-exports.sh \
tools/check-compare-generated.sh \
tools/check-gitlab-ci.sh \
tools/check-tree.sh \
tools/create-exports-NetworkManager.sh \
tools/debug-helper.py \
tools/meson-post-install.sh \
@ -5489,6 +5437,11 @@ endif
###############################################################################
check-tree:
"$(top_srcdir)/tools/check-tree.sh"
check_local += check-tree
check-po-msgfmt:
@echo "check-po-msgfmt: check $(top_srcdir)/po/*.po files with msgfmt -vc"
@for f in "$(top_srcdir)/po"/*.po ; do \

2
clients/cli/agent.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdio.h>
#include <stdlib.h>

2
clients/cli/common.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2012 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "common.h"

2
clients/cli/connections.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "connections.h"

2
clients/cli/devices.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "devices.h"

2
clients/cli/general.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/cli/generate-docs-nm-settings-nmcli.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-meta-setting-desc.h"

14
clients/cli/meson.build
View file

@ -27,7 +27,9 @@ executable(
readline_dep,
libnm_libnm_aux_dep,
],
c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format('nmcli')],
c_args: [
'-DG_LOG_DOMAIN="nmcli"',
],
link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,
install: true,
@ -45,7 +47,9 @@ generate_docs_nm_settings_nmcli = executable(
libnmc_dep,
libnm_libnm_aux_dep,
],
c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format('nmcli')],
c_args: [
'-DG_LOG_DOMAIN="nmcli"',
],
link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,
)
@ -61,7 +65,11 @@ if enable_docs
test(
'check-local-generate-docs-nm-settings-nmcli',
find_program(join_paths(source_root, 'tools', 'check-compare-generated.sh')),
args: [source_root, build_root, 'clients/cli/generate-docs-nm-settings-nmcli.xml'],
args: [
source_root,
build_root,
'clients/cli/generate-docs-nm-settings-nmcli.xml',
],
)
else
settings_docs_source = configure_file(

2
clients/cli/nmcli.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2010 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmcli.h"

2
clients/cli/polkit-agent.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "polkit-agent.h"

2
clients/cli/settings.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 - 2015 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "settings.h"

1
clients/cli/settings.h
View file

@ -6,7 +6,6 @@
#ifndef NMC_SETTINGS_H
#define NMC_SETTINGS_H
#include "nm-meta-setting.h"
#include "nm-meta-setting-desc.h"
#include "nmcli.h"

2
clients/cli/utils.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2010 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "utils.h"

2
clients/cloud-setup/main.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-libnm-aux/nm-libnm-aux.h"

29
clients/cloud-setup/meson.build
View file

@ -1,7 +1,5 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
name = 'nm-cloud-setup'
if install_systemdunitdir
nm_cloud_setup_service = configure_file(
@ -23,27 +21,26 @@ if install_systemdunitdir
endif
sources = files(
'main.c',
'nm-cloud-setup-utils.c',
'nm-http-client.c',
'nmcs-provider-ec2.c',
'nmcs-provider-gcp.c',
'nmcs-provider-azure.c',
'nmcs-provider.c',
)
executable(
name,
sources,
'nm-cloud-setup',
files(
'main.c',
'nm-cloud-setup-utils.c',
'nm-http-client.c',
'nmcs-provider-ec2.c',
'nmcs-provider-gcp.c',
'nmcs-provider-azure.c',
'nmcs-provider.c',
),
dependencies: [
libnmc_base_dep,
libnmc_dep,
libcurl_dep,
libnm_libnm_aux_dep,
],
c_args: clients_c_flags +
['-DG_LOG_DOMAIN="@0@"'.format(name)],
c_args: [
'-DG_LOG_DOMAIN="nm-cloud-setup"',
],
link_with: libnm_systemd_logging_stub,
link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,

2
clients/cloud-setup/nm-cloud-setup-utils.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-cloud-setup-utils.h"

2
clients/cloud-setup/nm-http-client.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-http-client.h"

2
clients/cloud-setup/nmcs-provider-azure.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmcs-provider-azure.h"

2
clients/cloud-setup/nmcs-provider-ec2.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmcs-provider-ec2.h"

2
clients/cloud-setup/nmcs-provider-gcp.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmcs-provider-gcp.h"

2
clients/cloud-setup/nmcs-provider.c
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmcs-provider.h"

83
clients/common/meson.build
View file

@ -2,72 +2,87 @@
common_inc = include_directories('.')
common_deps = [
libnm_dep,
libnm_nm_default_dep,
]
common_c_flags = clients_c_flags + ['-DG_LOG_DOMAIN="libnmc"']
sources = files(
'nm-client-utils.c',
'nm-secret-agent-simple.c',
'nm-vpn-helpers.c',
'nm-polkit-listener.c',
)
libnmc_base = static_library(
'nmc-base',
sources: sources,
dependencies: common_deps,
c_args: common_c_flags,
sources: files(
'nm-client-utils.c',
'nm-secret-agent-simple.c',
'nm-vpn-helpers.c',
'nm-polkit-listener.c',
),
dependencies: [
libnm_dep,
libnm_nm_default_dep,
],
c_args: [
'-DG_LOG_DOMAIN="libnmc"',
],
)
libnmc_base_dep = declare_dependency(
include_directories: common_inc,
dependencies: common_deps,
dependencies: [
libnm_dep,
libnm_nm_default_dep,
],
link_with: libnmc_base,
)
settings_docs = 'settings-docs.h'
if enable_docs
settings_docs_source = custom_target(
settings_docs,
'settings-docs.h',
input: nm_settings_docs_xml_gir,
output: settings_docs,
command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
output: 'settings-docs.h',
command: [
xsltproc,
'--output',
'@OUTPUT@',
join_paths(meson.current_source_dir(), 'settings-docs.xsl'),
'@INPUT@',
],
)
test(
'check-settings-docs',
find_program(join_paths(source_root, 'tools', 'check-compare-generated.sh')),
args: [source_root, build_root, 'clients/common/' + settings_docs],
args: [
source_root,
build_root,
'clients/common/settings-docs.h',
],
)
else
settings_docs_source = configure_file(
input: settings_docs + '.in',
input: 'settings-docs.h.in',
output: '@BASENAME@',
configuration: configuration_data(),
)
endif
sources = nm_meta_setting_source + [settings_docs_source] + files(
'nm-meta-setting-access.c',
'nm-meta-setting-desc.c',
)
libnmc = static_library(
'nmc',
sources: sources,
dependencies: common_deps + [libnm_libnm_core_aux_dep],
c_args: c_flags,
sources: [settings_docs_source] + files(
'nm-meta-setting-access.c',
'nm-meta-setting-base-impl.c',
'nm-meta-setting-desc.c',
),
dependencies: [
libnm_dep,
libnm_nm_default_dep,
libnm_libnm_core_aux_dep,
],
c_args: [
'-DG_LOG_DOMAIN="libnmc"',
],
link_depends: settings_docs_source,
)
libnmc_dep = declare_dependency(
include_directories: common_inc,
dependencies: common_deps,
dependencies: [
libnm_dep,
libnm_nm_default_dep,
],
link_with: libnmc,
)

2
clients/common/nm-client-utils.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 - 2017 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-client-utils.h"

2
clients/common/nm-client-utils.h
View file

@ -6,7 +6,7 @@
#ifndef __NM_CLIENT_UTILS_H__
#define __NM_CLIENT_UTILS_H__
#include "nm-meta-setting.h"
#include "nm-meta-setting-desc.h"
#include "nm-active-connection.h"
#include "nm-device.h"
#include "nm-libnm-core-intern/nm-libnm-core-utils.h"

2
clients/common/nm-meta-setting-access.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 - 2017 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-meta-setting-access.h"

1
clients/common/nm-meta-setting-access.h
View file

@ -6,7 +6,6 @@
#ifndef _NM_META_SETTING_ACCESS_H__
#define _NM_META_SETTING_ACCESS_H__
#include "nm-meta-setting.h"
#include "nm-meta-setting-desc.h"
/*****************************************************************************/

25
shared/nm-meta-setting.c → clients/common/nm-meta-setting-base-impl.c
View file

@ -3,9 +3,9 @@
* Copyright (C) 2017 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
#include "nm-meta-setting.h"
#include "nm-meta-setting-base.h"
#include "nm-setting-6lowpan.h"
#include "nm-setting-8021x.h"
@ -516,8 +516,7 @@ nm_meta_setting_infos_by_name(const char *name)
{
gssize idx;
#if NM_MORE_ASSERTS > 10
{
if (NM_MORE_ASSERTS > 10) {
guint i, j;
for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) {
@ -545,7 +544,6 @@ nm_meta_setting_infos_by_name(const char *name)
}
}
}
#endif
G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMMetaSettingInfo, setting_name) == 0);
idx = nm_utils_array_find_binary_search(nm_meta_setting_infos,
@ -561,7 +559,7 @@ nm_meta_setting_infos_by_name(const char *name)
const NMMetaSettingInfo *
nm_meta_setting_infos_by_gtype(GType gtype)
{
#if ((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
#if _NM_META_SETTING_BASE_IMPL_LIBNM
nm_auto_unref_gtypeclass GTypeClass *gtypeclass_unref = NULL;
GTypeClass * gtypeclass;
NMSettingClass * klass;
@ -587,20 +585,19 @@ nm_meta_setting_infos_by_gtype(GType gtype)
out_none:
#if NM_MORE_ASSERTS > 10
{
int i;
if (NM_MORE_ASSERTS > 10) {
int i;
/* this might hint to a bug, but it would be expected for NM_TYPE_SETTING
/* this might hint to a bug, but it would be expected for NM_TYPE_SETTING
* and NM_TYPE_SETTING_IP_CONFIG.
*
* Assert that we didn't lookup for a gtype, which we would expect to find.
* An assertion failure here, hints to a bug in nm_setting_*_class_init().
*/
for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++)
nm_assert(nm_meta_setting_infos[i].get_setting_gtype() != gtype);
}
#endif
for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++)
nm_assert(nm_meta_setting_infos[i].get_setting_gtype() != gtype);
}
return NULL;
#else
guint i;

47
shared/nm-meta-setting.h → clients/common/nm-meta-setting-base-impl.h
View file

@ -3,8 +3,8 @@
* Copyright (C) 2017 - 2018 Red Hat, Inc.
*/
#ifndef __NM_META_SETTING_H__
#define __NM_META_SETTING_H__
#ifndef __NM_META_SETTING_BASE_IMPL_H__
#define __NM_META_SETTING_BASE_IMPL_H__
#include "nm-setting-8021x.h"
@ -158,50 +158,21 @@ typedef enum {
_NM_META_SETTING_TYPE_NUM = NM_META_SETTING_TYPE_UNKNOWN,
} NMMetaSettingType;
/* this header is statically linked with both libnm-core.la and libnmc.la.
* Though, there is no stable API/ABI, so whenever on of these components
* accesses NMMetaSettingInfo or NMMetaSettingType, it only has meaning
* inside the same component.
*
* Note how NMSettingClass has field of type "struct _NMMetaSettingInfo".
* It would be a serious bug, if libnmc tries to interpret this pointer
* with the meaning of NMMetaSettingInfo. They might be different, because
* libnm.so (libnm-core.la) might be a newer version than nmcli (libnmc.la).
*
* This define helps to ensure that we don't accidentally use the pointer
* in different contexts. */
#if ((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
#define _NMMetaSettingInfoXX _NMMetaSettingInfo
#if _NM_META_SETTING_BASE_IMPL_LIBNM
#define _NMMetaSettingInfo_Alias _NMMetaSettingInfo
#else
#define _NMMetaSettingInfoXX _NMMetaSettingInfoCli
#define _NMMetaSettingInfo_Alias _NMMetaSettingInfoCli
#endif
struct _NMMetaSettingInfoXX {
struct _NMMetaSettingInfo_Alias {
const char *setting_name;
GType (*get_setting_gtype)(void);
NMMetaSettingType meta_type;
NMSettingPriority setting_priority;
};
typedef struct _NMMetaSettingInfoXX NMMetaSettingInfo;
typedef struct _NMMetaSettingInfo_Alias NMMetaSettingInfo;
/* note that we statically link nm-meta-setting.h both to libnm-core.la and
* libnmc.la. That means, there are two versions of nm_meta_setting_infos
* in nmcli. That is not easily avoidable, because at this point, we don't
* want yet to making it public API.
*
* Eventually, this should become public API of libnm, and nmcli/libnmc.la
* should use that version.
*
* Downsides of the current solution:
*
* - duplication of the array in nmcli.
*
* - there is no stable API/ABI. That means, when you have a NMMetaSettingInfo
* pointer, or a NMMetaSettingType value, the value can only be used within
* the current context (libnm-core.la or libnmc.la). In other words, libnmc.la
* (and nmcli) must never access a NMMetaSettingInfo/NMMetaSettingType value,
* that comes from libnm-core.la.
*/
extern const NMMetaSettingInfo nm_meta_setting_infos[_NM_META_SETTING_TYPE_NUM + 1];
const NMMetaSettingInfo *nm_meta_setting_infos_by_name(const char *name);
@ -213,4 +184,4 @@ NMSettingPriority nm_meta_setting_info_get_base_type_priority(const NMMetaSettin
GType gtype);
NMSettingPriority _nm_setting_type_get_base_type_priority(GType type);
#endif /* __NM_META_SETTING_H__ */
#endif /* __NM_META_SETTING_BASE_IMPL_H__ */

10
clients/common/nm-meta-setting-base.h Normal file
View file

@ -0,0 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#ifndef __NM_META_SETTING_BASE_H__
#define __NM_META_SETTING_BASE_H__
#define _NM_META_SETTING_BASE_IMPL_LIBNM 0
#include "nm-meta-setting-base-impl.h"
#endif /* __NM_META_SETTING_BASE_H__ */

2
clients/common/nm-meta-setting-desc.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2010 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-meta-setting-desc.h"

2
clients/common/nm-meta-setting-desc.h
View file

@ -7,7 +7,7 @@
#define __NM_META_SETTING_DESC_H__
#include "nm-glib-aux/nm-obj.h"
#include "nm-meta-setting.h"
#include "nm-meta-setting-base.h"
#include "nm-base/nm-ethtool-base.h"
struct _NMDevice;

2
clients/common/nm-polkit-listener.c
View file

@ -18,7 +18,7 @@
* https://github.com/lxde/lxqt-policykit/tree/master/src
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-polkit-listener.h"

2
clients/common/nm-secret-agent-simple.c
View file

@ -16,7 +16,7 @@
* replace ShellNetworkAgent.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-secret-agent-simple.h"

2
clients/common/nm-vpn-helpers.c
View file

@ -8,7 +8,7 @@
* @short_description: VPN-related utilities
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-vpn-helpers.h"

48
clients/common/tests/meson.build
View file

@ -1,45 +1,39 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
common_c_flags = clients_c_flags + ['-DNETWORKMANAGER_COMPILATION_TEST']
test_name = 'test-clients-common'
deps = [
libnmc_base_dep,
libnmc_dep,
]
exe = executable(
test_name,
test_name + '.c',
dependencies: deps,
c_args: common_c_flags,
'test-clients-common',
'test-clients-common.c',
dependencies: [
libnmc_base_dep,
libnmc_dep,
],
c_args: [
'-DG_LOG_DOMAIN="test"',
],
)
test(
'clients/common/tests/' + test_name,
'clients/common/tests/test-clients-common',
test_script,
args: test_args + [exe.full_path()],
)
test_name = 'test-libnm-core-aux'
deps = [
libnm_dep,
libnm_libnm_core_aux_dep,
libnm_nm_default_dep,
]
exe = executable(
test_name,
test_name + '.c',
dependencies: deps,
c_args: common_c_flags,
'test-libnm-core-aux',
'test-libnm-core-aux.c',
dependencies: [
libnm_dep,
libnm_libnm_core_aux_dep,
libnm_nm_default_dep,
],
c_args: [
'-DG_LOG_DOMAIN="test"',
],
link_with: libnm_systemd_logging_stub,
)
test(
'clients/common/tests/' + test_name,
'clients/common/tests/test-libnm-core-aux',
test_script,
args: test_args + [exe.full_path()]
)

2
clients/common/tests/test-clients-common.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2017 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-meta-setting-access.h"
#include "nm-vpn-helpers.h"

2
clients/common/tests/test-libnm-core-aux.c
View file

@ -3,7 +3,7 @@
* Copyright (C) 2019 Red Hat, Inc.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-libnm-core-aux/nm-libnm-core-aux.h"
#include "nm-libnm-core-intern/nm-libnm-core-utils.h"

12
clients/meson.build
View file

@ -1,18 +1,16 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
clients_c_flags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT']
name = 'nm-online'
executable(
name,
name + '.c',
'nm-online',
'nm-online' + '.c',
dependencies: [
libnm_dep,
libnm_nm_default_dep,
libnm_libnm_aux_dep,
],
c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format(name)],
c_args: [
'-DG_LOG_DOMAIN="nm-online"',
],
link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,
install: true,

2
clients/nm-online.c
View file

@ -16,7 +16,7 @@
* Robert Love <rml@novell.com>
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdio.h>
#include <stdlib.h>

110
clients/tui/meson.build
View file

@ -1,66 +1,60 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
name = 'nmtui'
common_c_flags = clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format(name)]
subdir('newt')
sources = files(
'nm-editor-bindings.c',
'nm-editor-utils.c',
'nmt-address-list.c',
'nmt-connect-connection-list.c',
'nmt-device-entry.c',
'nmt-edit-connection-list.c',
'nmt-editor.c',
'nmt-editor-grid.c',
'nmt-editor-page.c',
'nmt-editor-page-device.c',
'nmt-editor-section.c',
'nmt-ip-entry.c',
'nmt-mac-entry.c',
'nmt-mtu-entry.c',
'nmt-page-bond.c',
'nmt-page-bridge.c',
'nmt-page-bridge-port.c',
'nmt-page-dsl.c',
'nmt-page-ethernet.c',
'nmt-page-infiniband.c',
'nmt-page-ip4.c',
'nmt-page-ip6.c',
'nmt-page-ip-tunnel.c',
'nmt-page-ppp.c',
'nmt-page-team.c',
'nmt-page-team-port.c',
'nmt-page-vlan.c',
'nmt-page-wifi.c',
'nmt-password-dialog.c',
'nmt-password-fields.c',
'nmt-route-editor.c',
'nmt-route-entry.c',
'nmt-route-table.c',
'nmt-slave-list.c',
'nmtui.c',
'nmtui-connect.c',
'nmtui-edit.c',
'nmtui-hostname.c',
'nmt-utils.c',
'nmt-widget-list.c',
)
deps = [
libnmc_base_dep,
libnmc_dep,
libnmt_newt_dep,
libnm_libnm_aux_dep,
]
executable(
name,
sources,
dependencies: deps,
c_args: common_c_flags,
'nmtui',
files(
'nm-editor-bindings.c',
'nm-editor-utils.c',
'nmt-address-list.c',
'nmt-connect-connection-list.c',
'nmt-device-entry.c',
'nmt-edit-connection-list.c',
'nmt-editor.c',
'nmt-editor-grid.c',
'nmt-editor-page.c',
'nmt-editor-page-device.c',
'nmt-editor-section.c',
'nmt-ip-entry.c',
'nmt-mac-entry.c',
'nmt-mtu-entry.c',
'nmt-page-bond.c',
'nmt-page-bridge.c',
'nmt-page-bridge-port.c',
'nmt-page-dsl.c',
'nmt-page-ethernet.c',
'nmt-page-infiniband.c',
'nmt-page-ip4.c',
'nmt-page-ip6.c',
'nmt-page-ip-tunnel.c',
'nmt-page-ppp.c',
'nmt-page-team.c',
'nmt-page-team-port.c',
'nmt-page-vlan.c',
'nmt-page-wifi.c',
'nmt-password-dialog.c',
'nmt-password-fields.c',
'nmt-route-editor.c',
'nmt-route-entry.c',
'nmt-route-table.c',
'nmt-slave-list.c',
'nmtui.c',
'nmtui-connect.c',
'nmtui-edit.c',
'nmtui-hostname.c',
'nmt-utils.c',
'nmt-widget-list.c',
),
dependencies: [
libnmc_base_dep,
libnmc_dep,
libnmt_newt_dep,
libnm_libnm_aux_dep,
],
c_args: [
'-DG_LOG_DOMAIN="nmtui"',
],
link_with: libnm_systemd_logging_stub,
link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,

60
clients/tui/newt/meson.build
View file

@ -1,38 +1,36 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
sources = files(
'nmt-newt-button-box.c',
'nmt-newt-button.c',
'nmt-newt-checkbox.c',
'nmt-newt-component.c',
'nmt-newt-container.c',
'nmt-newt-entry.c',
'nmt-newt-entry-numeric.c',
'nmt-newt-form.c',
'nmt-newt-grid.c',
'nmt-newt-hacks.c',
'nmt-newt-label.c',
'nmt-newt-listbox.c',
'nmt-newt-popup.c',
'nmt-newt-section.c',
'nmt-newt-separator.c',
'nmt-newt-stack.c',
'nmt-newt-textbox.c',
'nmt-newt-toggle-button.c',
'nmt-newt-utils.c',
'nmt-newt-widget.c',
)
deps = [
libnm_nm_default_dep,
newt_dep,
]
libnmt_newt = static_library(
'nmt-newt',
sources: sources,
dependencies: deps,
c_args: common_c_flags,
sources: files(
'nmt-newt-button-box.c',
'nmt-newt-button.c',
'nmt-newt-checkbox.c',
'nmt-newt-component.c',
'nmt-newt-container.c',
'nmt-newt-entry.c',
'nmt-newt-entry-numeric.c',
'nmt-newt-form.c',
'nmt-newt-grid.c',
'nmt-newt-hacks.c',
'nmt-newt-label.c',
'nmt-newt-listbox.c',
'nmt-newt-popup.c',
'nmt-newt-section.c',
'nmt-newt-separator.c',
'nmt-newt-stack.c',
'nmt-newt-textbox.c',
'nmt-newt-toggle-button.c',
'nmt-newt-utils.c',
'nmt-newt-widget.c',
),
dependencies: [
libnm_nm_default_dep,
newt_dep,
],
c_args: [
'-DG_LOG_DOMAIN="nmtui"',
],
)
libnmt_newt_dep = declare_dependency(

2
clients/tui/newt/nmt-newt-button-box.c
View file

@ -16,7 +16,7 @@
* within each of the two sections.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-button-box.h"

2
clients/tui/newt/nmt-newt-button.c
View file

@ -10,7 +10,7 @@
* #NmtNewtButton implements a button widget.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-button.h"
#include "nmt-newt-utils.h"

2
clients/tui/newt/nmt-newt-checkbox.c
View file

@ -10,7 +10,7 @@
* #NmtNewtCheckbox implements a checkbox widget.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-checkbox.h"
#include "nmt-newt-utils.h"

2
clients/tui/newt/nmt-newt-component.c
View file

@ -11,7 +11,7 @@
* wrap a (single) #newtComponent.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-component.h"
#include "nmt-newt-form.h"

2
clients/tui/newt/nmt-newt-container.c
View file

@ -13,7 +13,7 @@
* #NmtNewtGrid is the most generic container type.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-container.h"

2
clients/tui/newt/nmt-newt-entry-numeric.c
View file

@ -13,7 +13,7 @@
* #NmtNewtEntryValidator functions, so you should not set your own.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/tui/newt/nmt-newt-entry.c
View file

@ -13,7 +13,7 @@
* See also #NmtNewtEntryNumeric, for numeric-only entries.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-entry.h"
#include "nmt-newt-form.h"

2
clients/tui/newt/nmt-newt-form.c
View file

@ -11,7 +11,7 @@
* "form" (aka dialog) to the user.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <fcntl.h>
#include <unistd.h>

2
clients/tui/newt/nmt-newt-grid.c
View file

@ -27,7 +27,7 @@
* must be implemented by the container...
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-grid.h"

2
clients/tui/newt/nmt-newt-hacks.c
View file

@ -11,7 +11,7 @@
* functions that were added after 0.52.15.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-hacks.h"

2
clients/tui/newt/nmt-newt-label.c
View file

@ -12,7 +12,7 @@
* See also #NmtNewtTextbox, for multiline.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-label.h"

2
clients/tui/newt/nmt-newt-listbox.c
View file

@ -18,7 +18,7 @@
* presses Return on a selection.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-listbox.h"
#include "nmt-newt-form.h"

2
clients/tui/newt/nmt-newt-popup.c
View file

@ -13,7 +13,7 @@
* #NmtNewtForm containing an #NmtNewtListbox to select from.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-popup.h"
#include "nmt-newt-form.h"

2
clients/tui/newt/nmt-newt-section.c
View file

@ -22,7 +22,7 @@
* extent of the section.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-section.h"

2
clients/tui/newt/nmt-newt-separator.c
View file

@ -12,7 +12,7 @@
* between widgets in containers that don't implement padding.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-separator.h"

2
clients/tui/newt/nmt-newt-stack.c
View file

@ -16,7 +16,7 @@
* children.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-stack.h"

2
clients/tui/newt/nmt-newt-textbox.c
View file

@ -11,7 +11,7 @@
* word-wrapping.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-textbox.h"

2
clients/tui/newt/nmt-newt-toggle-button.c
View file

@ -10,7 +10,7 @@
* #NmtNewtToggleButton implements a two-state toggle button.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-toggle-button.h"

2
clients/tui/newt/nmt-newt-utils.c
View file

@ -8,7 +8,7 @@
* @short_description: Utility functions
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdarg.h>
#include <unistd.h>

2
clients/tui/newt/nmt-newt-widget.c
View file

@ -21,7 +21,7 @@
* FIXME: need RTL support
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-newt-widget.h"
#include "nmt-newt-form.h"

2
clients/tui/nm-editor-bindings.c
View file

@ -12,7 +12,7 @@
* shared between nmtui, nm-connection-editor, and gnome-control-center.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-editor-bindings.h"

2
clients/tui/nm-editor-utils.c
View file

@ -12,7 +12,7 @@
* nm-connection-editor, and gnome-control-center.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-editor-utils.h"
#if 0

2
clients/tui/nmt-address-list.c
View file

@ -15,7 +15,7 @@
* functions.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-address-list.h"

2
clients/tui/nmt-connect-connection-list.c
View file

@ -11,7 +11,7 @@
* access points displayed by "nmtui connect".
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/tui/nmt-device-entry.c
View file

@ -21,7 +21,7 @@
* to implement that then we should make it just an #NmtNewtEntry.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-device-entry.h"

2
clients/tui/nmt-edit-connection-list.c
View file

@ -11,7 +11,7 @@
* "nmtui edit".
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmtui.h"
#include "nmtui-edit.h"

2
clients/tui/nmt-editor-grid.c
View file

@ -24,7 +24,7 @@
* section border into account as well.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-editor-grid.h"

2
clients/tui/nmt-editor-page-device.c
View file

@ -15,7 +15,7 @@
* an actual page type.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-editor-page-device.h"

2
clients/tui/nmt-editor-page.c
View file

@ -11,7 +11,7 @@
* A "page" is a set of related #NmtEditorSections.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-editor-page.h"

2
clients/tui/nmt-editor-section.c
View file

@ -10,7 +10,7 @@
* #NmtEditorSection is the abstract base class for #NmtEditor sections.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-editor-section.h"
#include "nmt-newt-toggle-button.h"

2
clients/tui/nmt-editor.c
View file

@ -10,7 +10,7 @@
* #NmtEditor is the top-level form for editing a connection.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-editor.h"

2
clients/tui/nmt-ip-entry.c
View file

@ -14,7 +14,7 @@
* contains a valid IP address.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <arpa/inet.h>
#include <netinet/in.h>

2
clients/tui/nmt-mac-entry.c
View file

@ -13,7 +13,7 @@
* on whether it currently contains a valid hardware address.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-mac-entry.h"

2
clients/tui/nmt-mtu-entry.c
View file

@ -17,7 +17,7 @@
* indicating the units used by the entry.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/tui/nmt-page-bond.c
View file

@ -12,7 +12,7 @@
* can't just use #GBinding.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-bond.h"

2
clients/tui/nmt-page-bridge-port.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for Bridge ports
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-bridge-port.h"

2
clients/tui/nmt-page-bridge.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for Bridge connections
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-bridge.h"

2
clients/tui/nmt-page-dsl.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for DSL connections
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-dsl.h"
#include "nmt-page-ethernet.h"

2
clients/tui/nmt-page-ethernet.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for Ethernet connections
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-ethernet.h"

2
clients/tui/nmt-page-infiniband.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for InfiniBand connections
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-infiniband.h"
#include "nmt-mtu-entry.h"

2
clients/tui/nmt-page-ip-tunnel.c
View file

@ -7,7 +7,7 @@
* @short_description: The editor page for IP tunnel connections
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-ip-tunnel.h"

2
clients/tui/nmt-page-ip4.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for IP4 configuration
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/tui/nmt-page-ip6.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for IP6 configuration
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/tui/nmt-page-ppp.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for PPP configuration
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/tui/nmt-page-team-port.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for Team ports.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-team-port.h"

2
clients/tui/nmt-page-team.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for Team connections
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-page-team.h"

2
clients/tui/nmt-page-vlan.c
View file

@ -8,7 +8,7 @@
* @short_description: The editor page for VLAN connections
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nm-editor-bindings.h"

2
clients/tui/nmt-page-wifi.c
View file

@ -12,7 +12,7 @@
* properties.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>
#include <linux/if_ether.h>

2
clients/tui/nmt-password-dialog.c
View file

@ -11,7 +11,7 @@
* secrets when activating a connection.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-password-dialog.h"
#include "nm-secret-agent-simple.h"

2
clients/tui/nmt-password-fields.c
View file

@ -12,7 +12,7 @@
* "Show password" checkbox that toggles whether the password is visible.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-password-fields.h"

2
clients/tui/nmt-route-editor.c
View file

@ -12,7 +12,7 @@
* wide to fit into the main window.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-route-editor.h"
#include "nmt-route-table.h"

2
clients/tui/nmt-route-entry.c
View file

@ -13,7 +13,7 @@
* This is used as a building block by #NmtRouteTable.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <arpa/inet.h>
#include <netinet/in.h>

2
clients/tui/nmt-route-table.c
View file

@ -11,7 +11,7 @@
* and buttons to add and remove entries.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <arpa/inet.h>
#include <netinet/in.h>

2
clients/tui/nmt-slave-list.c
View file

@ -11,7 +11,7 @@
* slaves of a connection.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-slave-list.h"

2
clients/tui/nmt-utils.c
View file

@ -8,7 +8,7 @@
* @short_description: Miscellaneous nmtui-specific utilities
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-utils.h"

2
clients/tui/nmt-widget-list.c
View file

@ -17,7 +17,7 @@
* FIXME: The way this works is sort of weird.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include "nmt-widget-list.h"

2
clients/tui/nmtui-connect.c
View file

@ -11,7 +11,7 @@
* including presenting a password dialog if necessary.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

2
clients/tui/nmtui-edit.c
View file

@ -10,7 +10,7 @@
* nmtui-edit implements editing #NMConnections.
*/
#include "nm-default.h"
#include "libnm/nm-default-client.h"
#include <stdlib.h>

Some files were not shown because too many files have changed in this diff Show more