vpn-plugin-info: drop nm_vpn_plugin_info_get_service()

It is not used externally and its use might be confusing and undesired when we
add plugin aliases. The external users should only use the name when idenfiying
the plugin and nm_vpn_plugin_info_list_find_by_service() when matchin the plugin.

4 files changed, 2 insertions, 22 deletions

diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c
index 6cd1eb8ca3..a059f2ec5b 100644
--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@@ -526,7 +526,7 @@ nm_vpn_plugin_info_list_find_by_service (GSList *list, const char *service)
 		g_return_val_if_reached (NULL);
 
 	for (iter = list; iter; iter = iter->next) {
-		if (strcmp (nm_vpn_plugin_info_get_service (iter->data), service) == 0)
+		if (strcmp (NM_VPN_PLUGIN_INFO_GET_PRIVATE (iter->data)->service, service) == 0)
 			return iter->data;
 	}
 	return NULL;
@@ -567,22 +567,6 @@ nm_vpn_plugin_info_get_name (NMVpnPluginInfo *self)
 }
 
 /**
- * nm_vpn_plugin_info_get_service:
- * @self: plugin info instance
- *
- * Returns: (transfer none): the service. Cannot be %NULL.
- *
- * Since: 1.2
- */
-const char *
-nm_vpn_plugin_info_get_service (NMVpnPluginInfo *self)
-{
-	g_return_val_if_fail (NM_IS_VPN_PLUGIN_INFO (self), NULL);
-
-	return NM_VPN_PLUGIN_INFO_GET_PRIVATE (self)->service;
-}
-
-/**
  * nm_vpn_plugin_info_get_plugin:
  * @self: plugin info instance
  *
@@ -760,7 +744,7 @@ nm_vpn_plugin_info_load_editor_plugin (NMVpnPluginInfo *self, GError **error)
 
 	priv->editor_plugin_loaded = TRUE;
 	priv->editor_plugin = nm_vpn_editor_plugin_load_from_file (plugin_filename,
-	                                                           nm_vpn_plugin_info_get_service (self),
+	                                                           priv->service,
 	                                                           getuid (),
 	                                                           NULL,
 	                                                           NULL,
diff --git a/libnm-core/nm-vpn-plugin-info.h b/libnm-core/nm-vpn-plugin-info.h
index ead6fb708b..667a4fe2d9 100644
--- a/libnm-core/nm-vpn-plugin-info.h
+++ b/libnm-core/nm-vpn-plugin-info.h
@@ -75,8 +75,6 @@ const char *nm_vpn_plugin_info_get_name        (NMVpnPluginInfo *self);
 NM_AVAILABLE_IN_1_2
 const char *nm_vpn_plugin_info_get_filename    (NMVpnPluginInfo *self);
 NM_AVAILABLE_IN_1_2
-const char *nm_vpn_plugin_info_get_service     (NMVpnPluginInfo *self);
-NM_AVAILABLE_IN_1_2
 const char *nm_vpn_plugin_info_get_plugin      (NMVpnPluginInfo *self);
 NM_AVAILABLE_IN_1_2
 const char *nm_vpn_plugin_info_get_program     (NMVpnPluginInfo *self);
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 5bf877a811..71ae69f3aa 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -906,7 +906,6 @@ global:
 	nm_vpn_plugin_info_get_name;
 	nm_vpn_plugin_info_get_plugin;
 	nm_vpn_plugin_info_get_program;
-	nm_vpn_plugin_info_get_service;
 	nm_vpn_plugin_info_get_type;
 	nm_vpn_plugin_info_load_editor_plugin;
 	nm_vpn_plugin_info_lookup_property;
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index b3ac9d3e05..0c0ac1c740 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -2046,7 +2046,6 @@ nm_vpn_connection_activate (NMVpnConnection *self,
 	g_return_if_fail (s_vpn);
 
 	service = nm_setting_vpn_get_service_type (s_vpn);
-	g_return_if_fail (!g_strcmp0 (service, nm_vpn_plugin_info_get_service (plugin_info)));
 
 	if (nm_vpn_plugin_info_supports_multiple (plugin_info)) {
 		const char *path;