[NetworkManager-openconnect/lr/gtk-4.0: 7/8] properties: remove NM_PLUGIN_DIR
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [NetworkManager-openconnect/lr/gtk-4.0: 7/8] properties: remove NM_PLUGIN_DIR
- Date: Tue, 26 Oct 2021 08:36:41 +0000 (UTC)
commit 772328fd4f3121cf7140edd7f36372f36ebae9f9
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Mon Oct 25 17:38:43 2021 +0200
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-openconnect-editor-plugin.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ce195c0..5096331 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,7 +115,6 @@ properties_libnm_vpn_plugin_openconnect_la_SOURCES = \
properties_libnm_vpn_plugin_openconnect_la_CFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
- -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
$(properties_cppflags) \
$(LIBNM_CFLAGS)
diff --git a/properties/nm-openconnect-editor-plugin.c b/properties/nm-openconnect-editor-plugin.c
index 7ccd98b..2b3ce41 100644
--- a/properties/nm-openconnect-editor-plugin.c
+++ b/properties/nm-openconnect-editor-plugin.c
@@ -2,7 +2,7 @@
/***************************************************************************
* Copyright (C) 2005 David Zeuthen, <davidz redhat com>
* Copyright (C) 2005 - 2008 Dan Williams, <dcbw redhat com>
- * Copyright (C) 2005 - 2011 Red Hat, Inc.
+ * Copyright (C) 2005 - 2021 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -523,7 +523,7 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
#ifdef NM_VPN_OLD
return nm_vpn_editor_new (connection, error);
#else
- return nm_vpn_plugin_utils_load_editor
(NM_PLUGIN_DIR"/libnm-vpn-plugin-openconnect-editor.so",
+ return nm_vpn_plugin_utils_load_editor ("libnm-vpn-plugin-openconnect-editor.so",
"nm_vpn_editor_factory_openconnect",
_call_editor_factory,
iface,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]