diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-24 07:40:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-24 12:48:51 +0100 |
| commit | ad91579bb8badd999b92dd04239c6078374ad3dc (patch) | |
| tree | cd33dcf74ae5f32d8bcad781ea46e93abe2e780b | |
| parent | fa288f65f6d9bea550936248ebfa8278e04acd88 (diff) | |
| download | NetworkManager-ad91579bb8badd999b92dd04239c6078374ad3dc.tar.gz | |
shared: move "nm-vpn-editor-plugin-call.h" to "src/contrib/"
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | po/POTFILES.skip | 2 | ||||
| -rw-r--r-- | src/contrib/nm-vpn-editor-plugin-call.h (renamed from shared/nm-utils/nm-vpn-editor-plugin-call.h) | 0 | ||||
| -rw-r--r-- | src/libnm-client-impl/nm-vpn-service-plugin.c | 7 | ||||
| -rw-r--r-- | src/libnm-client-impl/tests/test-nm-client.c | 7 |
5 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 388b5703f7..6a4af83ded 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5522,7 +5522,6 @@ EXTRA_DIST += \ \ shared/nm-utils/nm-compat.c \ shared/nm-utils/nm-compat.h \ - shared/nm-utils/nm-vpn-editor-plugin-call.h \ shared/nm-utils/nm-vpn-plugin-macros.h \ shared/meson.build \ \ @@ -5530,6 +5529,8 @@ EXTRA_DIST += \ \ src/libnm-core-public/nm-version-macros.h.in \ \ + src/contrib/nm-vpn-editor-plugin-call.h \ + \ tools/check-config-options.sh \ tools/check-docs.sh \ tools/check-exports.sh \ diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 0eb6e34aff..58b2f7b288 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -5,7 +5,7 @@ data/NetworkManager.service.in data/org.freedesktop.NetworkManager.policy.in examples/python/NetworkManager.py examples/python/systray/eggtrayicon.c -shared/nm-utils/nm-vpn-editor-plugin-call.h +src/contrib/nm-vpn-editor-plugin-call.h src/contrib/nm-vpn-plugin-utils.c vpn-daemons/openvpn vpn-daemons/pptp diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/src/contrib/nm-vpn-editor-plugin-call.h index be0a6772e2..be0a6772e2 100644 --- a/shared/nm-utils/nm-vpn-editor-plugin-call.h +++ b/src/contrib/nm-vpn-editor-plugin-call.h diff --git a/src/libnm-client-impl/nm-vpn-service-plugin.c b/src/libnm-client-impl/nm-vpn-service-plugin.c index 8262981d70..74e9e24f4f 100644 --- a/src/libnm-client-impl/nm-vpn-service-plugin.c +++ b/src/libnm-client-impl/nm-vpn-service-plugin.c @@ -1333,10 +1333,3 @@ nm_vpn_service_plugin_initable_iface_init(GInitableIface *iface) { iface->init = init_sync; } - -/*****************************************************************************/ - -/* this header is intended to be copied to users of nm_vpn_editor_plugin_call(), - * to simplify invocation of generic functions. Include it here, to compile - * the code. */ -#include "nm-utils/nm-vpn-editor-plugin-call.h" diff --git a/src/libnm-client-impl/tests/test-nm-client.c b/src/libnm-client-impl/tests/test-nm-client.c index c76c82a1ee..55b886a08c 100644 --- a/src/libnm-client-impl/tests/test-nm-client.c +++ b/src/libnm-client-impl/tests/test-nm-client.c @@ -1291,3 +1291,10 @@ main(int argc, char **argv) return g_test_run(); } + +/*****************************************************************************/ + +/* this header is intended to be copied to users of nm_vpn_editor_plugin_call(), + * to simplify invocation of generic functions. Include it here, to compile + * the code. */ +#include "contrib/nm-vpn-editor-plugin-call.h" |