[NetworkManager-openvpn/lr/gtk4-dist-check: 2/6] properties: remove NM_PLUGIN_DIR




commit 6de10386cc8d1c636fe5fd75c4c82d6fec3cf807
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Nov 11 09:15:48 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                           | 2 --
 properties/nm-openvpn-editor-plugin.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8052274..00bf5f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,7 +126,6 @@ properties_libnm_vpn_plugin_openvpn_utils_la_SOURCES = \
 
 properties_libnm_vpn_plugin_openvpn_utils_la_CPPFLAGS = \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-       -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
        $(properties_cppflags) \
        $(LIBNM_CFLAGS)
 
@@ -144,7 +143,6 @@ properties_libnm_vpn_plugin_openvpn_core_la_SOURCES = \
 
 properties_libnm_vpn_plugin_openvpn_core_la_CPPFLAGS = \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-       -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
        $(properties_cppflags) \
        $(LIBNM_CFLAGS)
 
diff --git a/properties/nm-openvpn-editor-plugin.c b/properties/nm-openvpn-editor-plugin.c
index 8d55eeb..9fd08d9 100644
--- a/properties/nm-openvpn-editor-plugin.c
+++ b/properties/nm-openvpn-editor-plugin.c
@@ -134,7 +134,7 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
 #if ((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL)
                return openvpn_editor_new (connection, error);
 #else
-               return nm_vpn_plugin_utils_load_editor (NM_PLUGIN_DIR"/libnm-vpn-plugin-openvpn-editor.so",
+               return nm_vpn_plugin_utils_load_editor ("libnm-vpn-plugin-openvpn-editor.so",
                                                        "nm_vpn_editor_factory_openvpn",
                                                        _call_editor_factory,
                                                        iface,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]