Merge pull request #6829 from gebner/gnome-control-center-vpn-sopath

Patch gnome-control-center not to override VPN plugin paths.
This commit is contained in:
lethalman 2015-03-17 12:19:05 +01:00
commit 1099ea2d0d
2 changed files with 20 additions and 1 deletions

View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
done
'';
patches = [ ./search_providers_dir.patch ];
patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ];
meta = with stdenv.lib; {
description = "Single sign-on framework for GNOME";

View file

@ -0,0 +1,19 @@
diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
index 7dc23c2..fcb1384 100644
--- a/panels/network/connection-editor/vpn-helpers.c
+++ b/panels/network/connection-editor/vpn-helpers.c
@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
if (!so_path)
goto next;
- /* Remove any path and extension components, then reconstruct path
- * to the SO in LIBDIR
- */
- so_name = g_path_get_basename (so_path);
- g_free (so_path);
- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
- g_free (so_name);
-
module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!module) {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "