[NetworkManager-vpnc/lr/gtk-4.0: 10/17] properties: remove NM_PLUGIN_DIR
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [NetworkManager-vpnc/lr/gtk-4.0: 10/17] properties: remove NM_PLUGIN_DIR
- Date: Mon, 17 Jan 2022 09:38:56 +0000 (UTC)
commit 7aed2caee62f7641f97cdef50e947ddaabf85561
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Wed Nov 3 14:01:59 2021 +0100
properties: remove NM_PLUGIN_DIR
This does nothing, nm_vpn_plugin_utils_load_editor() is more than happy
with a relative path.
Makefile.am | 1 -
properties/nm-vpnc-editor-plugin.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 787863b..32faec6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,6 @@ properties_libnm_vpn_plugin_vpnc_la_SOURCES = \
properties_libnm_vpn_plugin_vpnc_la_CFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
- -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
$(common_cppflags) \
$(LIBNM_CFLAGS)
diff --git a/properties/nm-vpnc-editor-plugin.c b/properties/nm-vpnc-editor-plugin.c
index b49c69c..5a50145 100644
--- a/properties/nm-vpnc-editor-plugin.c
+++ b/properties/nm-vpnc-editor-plugin.c
@@ -825,7 +825,7 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
#ifdef NM_VPN_OLD
return nm_vpnc_editor_new (connection, error);
#else
- return nm_vpn_plugin_utils_load_editor (NM_PLUGIN_DIR"/libnm-vpn-plugin-vpnc-editor.so",
+ return nm_vpn_plugin_utils_load_editor ("libnm-vpn-plugin-vpnc-editor.so",
"nm_vpn_editor_factory_vpnc",
_call_editor_factory,
iface,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]