From c12e861ccf2a2c7ab409ca099666260e0f530670 Mon Sep 17 00:00:00 2001 From: Max Moser Date: Mon, 12 Feb 2018 16:06:08 +0100 Subject: [PATCH] Continue transition --- .gitignore | 2 +- Makefile.am | 96 +++++++++---------- ... => libnm-vpn-plugin-wireguard-editor.ver} | 0 ...vpn.ver => libnm-vpn-plugin-wireguard.ver} | 0 ...ies.ver => libnm-wireguard-properties.ver} | 0 ...-plugin.c => nm-wireguard-editor-plugin.c} | 6 +- ...-plugin.h => nm-wireguard-editor-plugin.h} | 2 +- ...openvpn-editor.c => nm-wireguard-editor.c} | 4 +- ...openvpn-editor.h => nm-wireguard-editor.h} | 2 +- properties/tests/test-import-export.c | 4 +- src/nm-wireguard-service.c | 3 - 11 files changed, 58 insertions(+), 61 deletions(-) rename properties/{libnm-vpn-plugin-openvpn-editor.ver => libnm-vpn-plugin-wireguard-editor.ver} (100%) rename properties/{libnm-vpn-plugin-openvpn.ver => libnm-vpn-plugin-wireguard.ver} (100%) rename properties/{libnm-openvpn-properties.ver => libnm-wireguard-properties.ver} (100%) rename properties/{nm-openvpn-editor-plugin.c => nm-wireguard-editor-plugin.c} (97%) rename properties/{nm-openvpn-editor-plugin.h => nm-wireguard-editor-plugin.h} (96%) rename properties/{nm-openvpn-editor.c => nm-wireguard-editor.c} (99%) rename properties/{nm-openvpn-editor.h => nm-wireguard-editor.h} (96%) diff --git a/.gitignore b/.gitignore index b137586..575145a 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,7 @@ appdata/network-manager-wireguard.metainfo.xml */tests/*.trs test-*.log -auth-dialog/nm-openvpn-auth-dialog +auth-dialog/nm-wireguard-auth-dialog nm-wireguard-service.name nm-openvpn.desktop src/nm-wireguard-service diff --git a/Makefile.am b/Makefile.am index 0c3c8c1..84a28c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,7 @@ src_cppflags = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DLOCALSTATEDIR=\""$(localstatedir)"\" \ -DDATADIR=\"$(datadir)\" \ - -DNM_OPENVPN_LOCALEDIR=\"$(datadir)/locale\" \ + -DNM_WIREGUARD_LOCALEDIR=\"$(datadir)/locale\" \ -DG_LOG_DOMAIN=\"nm-wireguard\" \ -I$(srcdir)/shared \ $(GLIB_CFLAGS) \ @@ -102,14 +102,14 @@ EXTRA_DIST += \ properties/gresource.xml plugin_sources = \ - properties/nm-openvpn-editor-plugin.c \ - properties/nm-openvpn-editor-plugin.h + properties/nm-wireguard-editor-plugin.c \ + properties/nm-wireguard-editor-plugin.h editor_sources = \ properties/resources.c \ properties/resources.h \ - properties/nm-openvpn-editor.c \ - properties/nm-openvpn-editor.h \ + properties/nm-wireguard-editor.c \ + properties/nm-wireguard-editor.h \ properties/auth-helpers.c \ properties/auth-helpers.h @@ -121,88 +121,88 @@ properties_cppflags = \ ############################################################################### -noinst_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn-utils.la +noinst_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard-utils.la -properties_libnm_vpn_plugin_openvpn_utils_la_SOURCES = \ +properties_libnm_vpn_plugin_wireguard_utils_la_SOURCES = \ $(shared_sources) -properties_libnm_vpn_plugin_openvpn_utils_la_CPPFLAGS = \ +properties_libnm_vpn_plugin_wireguard_utils_la_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \ -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \ $(properties_cppflags) \ $(LIBNM_CFLAGS) -properties_libnm_vpn_plugin_openvpn_utils_la_LIBADD = \ +properties_libnm_vpn_plugin_wireguard_utils_la_LIBADD = \ $(LIBNM_LIBS) \ $(DL_LIBS) -noinst_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn-core.la +noinst_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard-core.la -properties_libnm_vpn_plugin_openvpn_core_la_SOURCES = \ +properties_libnm_vpn_plugin_wireguard_core_la_SOURCES = \ shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.h \ shared/nm-utils/nm-vpn-plugin-macros.h \ $(plugin_sources) -properties_libnm_vpn_plugin_openvpn_core_la_CPPFLAGS = \ +properties_libnm_vpn_plugin_wireguard_core_la_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \ -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \ $(properties_cppflags) \ $(LIBNM_CFLAGS) -properties_libnm_vpn_plugin_openvpn_core_la_LIBADD = \ - properties/libnm-vpn-plugin-openvpn-utils.la \ +properties_libnm_vpn_plugin_wireguard_core_la_LIBADD = \ + properties/libnm-vpn-plugin-wireguard-utils.la \ $(LIBNM_LIBS) \ $(DL_LIBS) -plugin_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn.la +plugin_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard.la -properties_libnm_vpn_plugin_openvpn_la_SOURCES = -properties_libnm_vpn_plugin_openvpn_la_LIBADD = \ - properties/libnm-vpn-plugin-openvpn-core.la -properties_libnm_vpn_plugin_openvpn_la_LDFLAGS = \ +properties_libnm_vpn_plugin_wireguard_la_SOURCES = +properties_libnm_vpn_plugin_wireguard_la_LIBADD = \ + properties/libnm-vpn-plugin-wireguard-core.la +properties_libnm_vpn_plugin_wireguard_la_LDFLAGS = \ -avoid-version \ - -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-openvpn.ver + -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-wireguard.ver ############################################################################### if WITH_GNOME -plugin_LTLIBRARIES += properties/libnm-vpn-plugin-openvpn-editor.la +plugin_LTLIBRARIES += properties/libnm-vpn-plugin-wireguard-editor.la endif -properties_libnm_vpn_plugin_openvpn_editor_la_SOURCES = \ +properties_libnm_vpn_plugin_wireguard_editor_la_SOURCES = \ $(editor_sources) -properties_libnm_vpn_plugin_openvpn_editor_la_CPPFLAGS = \ +properties_libnm_vpn_plugin_wireguard_editor_la_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \ $(properties_cppflags) \ $(GTK_CFLAGS) \ $(LIBNM_CFLAGS) \ $(LIBNMA_CFLAGS) -properties_libnm_vpn_plugin_openvpn_editor_la_LIBADD = \ - properties/libnm-vpn-plugin-openvpn-utils.la \ +properties_libnm_vpn_plugin_wireguard_editor_la_LIBADD = \ + properties/libnm-vpn-plugin-wireguard-utils.la \ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBNM_LIBS) \ $(LIBNMA_LIBS) -properties_libnm_vpn_plugin_openvpn_editor_la_LDFLAGS = \ +properties_libnm_vpn_plugin_wireguard_editor_la_LDFLAGS = \ -avoid-version \ - -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-openvpn-editor.ver + -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-wireguard-editor.ver ############################################################################### if WITH_LIBNM_GLIB -noinst_LTLIBRARIES += properties/libnm-openvpn-properties-core.la +noinst_LTLIBRARIES += properties/libnm-wireguard-properties-core.la endif -properties_libnm_openvpn_properties_core_la_SOURCES = \ +properties_libnm_wireguard_properties_core_la_SOURCES = \ $(shared_sources) \ $(plugin_sources) \ $(editor_sources) -properties_libnm_openvpn_properties_core_la_CPPFLAGS = \ +properties_libnm_wireguard_properties_core_la_CPPFLAGS = \ -DNM_VPN_OLD \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ $(properties_cppflags) \ @@ -210,7 +210,7 @@ properties_libnm_openvpn_properties_core_la_CPPFLAGS = \ $(LIBNM_GLIB_CFLAGS) \ $(LIBNM_GTK_CFLAGS) -properties_libnm_openvpn_properties_core_la_LIBADD = \ +properties_libnm_wireguard_properties_core_la_LIBADD = \ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBNM_GLIB_LIBS) \ @@ -218,20 +218,20 @@ properties_libnm_openvpn_properties_core_la_LIBADD = \ if WITH_LIBNM_GLIB -plugin_LTLIBRARIES += properties/libnm-openvpn-properties.la +plugin_LTLIBRARIES += properties/libnm-wireguard-properties.la endif -properties_libnm_openvpn_properties_la_SOURCES = -properties_libnm_openvpn_properties_la_LIBADD = \ - properties/libnm-openvpn-properties-core.la -properties_libnm_openvpn_properties_la_LDFLAGS = \ +properties_libnm_wireguard_properties_la_SOURCES = +properties_libnm_wireguard_properties_la_LIBADD = \ + properties/libnm-wireguard-properties-core.la +properties_libnm_wireguard_properties_la_LDFLAGS = \ -avoid-version \ - -Wl,--version-script=$(srcdir)/properties/libnm-openvpn-properties.ver + -Wl,--version-script=$(srcdir)/properties/libnm-wireguard-properties.ver EXTRA_DIST += \ - properties/libnm-vpn-plugin-openvpn.ver \ - properties/libnm-vpn-plugin-openvpn-editor.ver \ - properties/libnm-openvpn-properties.ver \ + properties/libnm-vpn-plugin-wireguard.ver \ + properties/libnm-vpn-plugin-wireguard-editor.ver \ + properties/libnm-wireguard-properties.ver \ properties/nm-wireguard-dialog.ui ############################################################################### @@ -255,7 +255,7 @@ properties_tests_test_import_export_CPPFLAGS = \ $(LIBNMA_CFLAGS) properties_tests_test_import_export_LDADD = \ - properties/libnm-vpn-plugin-openvpn-core.la \ + properties/libnm-vpn-plugin-wireguard-core.la \ $(GLIB_LIBS) \ $(LIBNM_LIBS) \ $(LIBNMA_LIBS) @@ -276,7 +276,7 @@ properties_tests_test_import_export_glib_CPPFLAGS = \ $(LIBNM_GTK_CFLAGS) properties_tests_test_import_export_glib_LDADD = \ - properties/libnm-openvpn-properties-core.la \ + properties/libnm-wireguard-properties-core.la \ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBNM_GLIB_LIBS) \ @@ -316,13 +316,13 @@ EXTRA_DIST += \ ############################################################################### if WITH_GNOME -libexec_PROGRAMS += auth-dialog/nm-openvpn-auth-dialog +libexec_PROGRAMS += auth-dialog/nm-wireguard-auth-dialog endif -auth_dialog_nm_openvpn_auth_dialog_SOURCES = \ +auth_dialog_nm_wireguard_auth_dialog_SOURCES = \ $(shared_sources) \ auth-dialog/main.c -auth_dialog_nm_openvpn_auth_dialog_CPPFLAGS = \ +auth_dialog_nm_wireguard_auth_dialog_CPPFLAGS = \ -DICONDIR=\""$(datadir)/pixmaps"\" \ -DBINDIR=\""$(bindir)"\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ @@ -332,15 +332,15 @@ auth_dialog_nm_openvpn_auth_dialog_CPPFLAGS = \ $(LIBNM_CFLAGS) \ $(LIBNMA_CFLAGS) \ $(LIBSECRET_CFLAGS) -auth_dialog_nm_openvpn_auth_dialog_LDFLAGS = \ +auth_dialog_nm_wireguard_auth_dialog_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" -auth_dialog_nm_openvpn_auth_dialog_LDADD = \ +auth_dialog_nm_wireguard_auth_dialog_LDADD = \ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBNM_LIBS) \ $(LIBNMA_LIBS) \ $(LIBSECRET_LIBS) -EXTRA_auth_dialog_nm_openvpn_auth_dialog_DEPENDENCIES = \ +EXTRA_auth_dialog_nm_wireguard_auth_dialog_DEPENDENCIES = \ linker-script-binary.ver ############################################################################### diff --git a/properties/libnm-vpn-plugin-openvpn-editor.ver b/properties/libnm-vpn-plugin-wireguard-editor.ver similarity index 100% rename from properties/libnm-vpn-plugin-openvpn-editor.ver rename to properties/libnm-vpn-plugin-wireguard-editor.ver diff --git a/properties/libnm-vpn-plugin-openvpn.ver b/properties/libnm-vpn-plugin-wireguard.ver similarity index 100% rename from properties/libnm-vpn-plugin-openvpn.ver rename to properties/libnm-vpn-plugin-wireguard.ver diff --git a/properties/libnm-openvpn-properties.ver b/properties/libnm-wireguard-properties.ver similarity index 100% rename from properties/libnm-openvpn-properties.ver rename to properties/libnm-wireguard-properties.ver diff --git a/properties/nm-openvpn-editor-plugin.c b/properties/nm-wireguard-editor-plugin.c similarity index 97% rename from properties/nm-openvpn-editor-plugin.c rename to properties/nm-wireguard-editor-plugin.c index 29cbb65..16bc368 100644 --- a/properties/nm-openvpn-editor-plugin.c +++ b/properties/nm-wireguard-editor-plugin.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /*************************************************************************** - * nm-openvpn-editor-plugin.c : GNOME UI dialogs for configuring openvpn VPN connections + * nm-wireguard-editor-plugin.c : GNOME UI dialogs for configuring wireguard VPN connections * * Copyright (C) 2005 Tim Niemueller * Copyright (C) 2008 - 2010 Dan Williams, @@ -25,7 +25,7 @@ #include "nm-default.h" -#include "nm-openvpn-editor-plugin.h" +#include "nm-wireguard-editor-plugin.h" #include #include @@ -34,7 +34,7 @@ #include #ifdef NM_VPN_OLD -#include "nm-openvpn-editor.h" +#include "nm-wireguard-editor.h" #else #include "nm-utils/nm-vpn-plugin-utils.h" #endif diff --git a/properties/nm-openvpn-editor-plugin.h b/properties/nm-wireguard-editor-plugin.h similarity index 96% rename from properties/nm-openvpn-editor-plugin.h rename to properties/nm-wireguard-editor-plugin.h index df7808f..a8c5776 100644 --- a/properties/nm-openvpn-editor-plugin.h +++ b/properties/nm-wireguard-editor-plugin.h @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /*************************************************************************** - * nm-openvpn-editor.h : GNOME UI dialogs for configuring openvpn VPN connections + * nm-wireguard-editor.h : GNOME UI dialogs for configuring wireguard VPN connections * * Copyright (C) 2008 Dan Williams, * diff --git a/properties/nm-openvpn-editor.c b/properties/nm-wireguard-editor.c similarity index 99% rename from properties/nm-openvpn-editor.c rename to properties/nm-wireguard-editor.c index de93bf8..6589f15 100644 --- a/properties/nm-openvpn-editor.c +++ b/properties/nm-wireguard-editor.c @@ -27,7 +27,7 @@ #include "nm-default.h" -#include "nm-openvpn-editor.h" +#include "nm-wireguard-editor.h" #include #include @@ -978,7 +978,7 @@ openvpn_editor_plugin_widget_class_init (OpenvpnEditorClass *req_class) #ifndef NM_VPN_OLD -#include "nm-openvpn-editor-plugin.h" +#include "nm-wireguard-editor-plugin.h" G_MODULE_EXPORT NMVpnEditor * nm_vpn_editor_factory_openvpn (NMVpnEditorPlugin *editor_plugin, diff --git a/properties/nm-openvpn-editor.h b/properties/nm-wireguard-editor.h similarity index 96% rename from properties/nm-openvpn-editor.h rename to properties/nm-wireguard-editor.h index 6940068..5a057bf 100644 --- a/properties/nm-openvpn-editor.h +++ b/properties/nm-wireguard-editor.h @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /*************************************************************************** - * nm-openvpn-editor.h : GNOME UI dialogs for configuring openvpn VPN connections + * nm-wireguard-editor.h : GNOME UI dialogs for configuring wireguard VPN connections * * Copyright (C) 2008 Dan Williams, * diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c index 64025ac..77b5a46 100644 --- a/properties/tests/test-import-export.c +++ b/properties/tests/test-import-export.c @@ -26,8 +26,8 @@ #include #include -#include "nm-openvpn-editor-plugin.h" -#include "nm-openvpn-editor.h" +#include "nm-wireguard-editor-plugin.h" +#include "nm-wireguard-editor.h" #include "import-export.h" #include "utils.h" diff --git a/src/nm-wireguard-service.c b/src/nm-wireguard-service.c index a93f3dc..8d12d5b 100644 --- a/src/nm-wireguard-service.c +++ b/src/nm-wireguard-service.c @@ -62,9 +62,6 @@ #ifndef LIBEXECDIR #define LIBEXECDIR "" #endif -#ifndef NM_OPENVPN_LOCALEDIR -#define NM_OPENVPN_LOCALEDIR "" -#endif #ifndef NM_WIREGUARD_LOCALEDIR #define NM_WIREGUARD_LOCALEDIR "" #endif