From 7583f6fc5ef2004030cf785f2cbe301dd2056d9d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 21 Aug 2015 13:36:11 +0200 Subject: [PATCH] libnm,vpn-editor-plugin: don't assert the plugin name is the same as service name It's not. It's meant to be human readable (e.g. "IPSec network that sometimes works"). --- libnm-core/nm-vpn-editor-plugin.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index 5657d17320..5cd0df5c55 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -151,23 +151,16 @@ nm_vpn_editor_plugin_load_from_file (const char *plugin_filename, g_assert (!editor_plugin || G_IS_OBJECT (editor_plugin)); if (editor_plugin) { - gs_free char *plug_name = NULL, *plug_service = NULL; + gs_free char *plug_service = NULL; /* Validate plugin properties */ g_object_get (G_OBJECT (editor_plugin), - NM_VPN_EDITOR_PLUGIN_NAME, &plug_name, NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service, NULL); - if (check_name && g_strcmp0 (plug_name, check_name) != 0) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load VPN plugin in '%s': invalid plugin name"), - g_module_name (module)); - } else if ( check_service - && g_strcmp0 (plug_service, check_service) != 0) { + if ( check_service + && g_strcmp0 (plug_service, check_service) != 0) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED,