Revert "WIP: fixup! vpn-manager: support multiple VPN connections of the same type"lr/multiple-vpn-2

Back this out because it doesn't build yet.

I'm not convinced we should do it at all too. Discussion in the bug.

This reverts commit d7301ada00bd7c5d0491a0cd74001cd1219be677.

2 files changed, 4 insertions, 41 deletions

diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index 653f60906e..0936ad9e9c 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -139,7 +139,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 enum {
 	PROP_0,
-	PROP_INT_PLUGIN_INFO,
 	PROP_VPN_STATE,
 	PROP_BANNER,
 	PROP_IP4_CONFIG,
@@ -738,18 +737,15 @@ add_ip6_vpn_gateway_route (NMIP6Config *config,
 
 NMVpnConnection *
 nm_vpn_connection_new (NMSettingsConnection *settings_connection,
-                       NMVpnPluginInfo *plugin_info,
                        NMDevice *parent_device,
                        const char *specific_object,
                        NMAuthSubject *subject)
 {
 	g_return_val_if_fail (!settings_connection || NM_IS_SETTINGS_CONNECTION (settings_connection), NULL);
-	g_return_val_if_fail (NM_IS_VPN_PLUGIN_INFO (plugin_info), NULL);
 	g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL);
 
 	return (NMVpnConnection *) g_object_new (NM_TYPE_VPN_CONNECTION,
 	                                         NM_ACTIVE_CONNECTION_INT_SETTINGS_CONNECTION, settings_connection,
-	                                         NM_VPN_CONNECTION_INT_PLUGIN_INFO, plugin_info,
 	                                         NM_ACTIVE_CONNECTION_INT_DEVICE, parent_device,
 	                                         NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object,
 	                                         NM_ACTIVE_CONNECTION_INT_SUBJECT, subject,
@@ -760,15 +756,10 @@ nm_vpn_connection_new (NMSettingsConnection *settings_connection,
 const char *
 nm_vpn_connection_get_service (NMVpnConnection *self)
 {
-	NMVpnConnectionPrivate *priv;
-
-	g_return_val_if_fail (NM_IS_VPN_CONNECTION (self), NULL);
-
-	priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
-
-	g_return_val_if_fail (priv->plugin_info, NULL);
+	NMSettingVpn *s_vpn;
 
-	return nm_vpn_plugin_info_get_service (priv->plugin_info);
+	s_vpn = nm_connection_get_setting_vpn (_get_applied_connection (self));
+	return nm_setting_vpn_get_service_type (s_vpn);
 }
 
 static const char *
@@ -2470,23 +2461,6 @@ get_property (GObject *object, guint prop_id,
 		break;
 	}
 }
-static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
-{
-	NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object);
-
-	switch (prop_id) {
-	case PROP_INT_PLUGIN_INFO:
-		/*construct-only*/
-		priv->plugin_info = g_value_dup_object (value);
-		g_return_if_fail (NM_IS_VPN_PLUGIN_INFO (priv->plugin_info));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
 
 static void
 nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class)
@@ -2498,7 +2472,6 @@ nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class)
 
 	/* virtual methods */
 	object_class->get_property = get_property;
-	object_class->set_property = set_property;
 	object_class->dispose = dispose;
 	object_class->finalize = finalize;
 	active_class->device_state_changed = device_state_changed;
@@ -2508,14 +2481,6 @@ nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class)
 
 	/* properties */
 	g_object_class_install_property
-		(object_class, PROP_INT_PLUGIN_INFO,
-		 g_param_spec_object (NM_VPN_CONNECTION_INT_PLUGIN_INFO, "", "",
-		                      NM_TYPE_VPN_PLUGIN_INFO,
-		                      G_PARAM_WRITABLE |
-		                      G_PARAM_CONSTRUCT_ONLY |
-		                      G_PARAM_STATIC_STRINGS));
-
-	g_object_class_install_property
 		(object_class, PROP_VPN_STATE,
 		 g_param_spec_uint (NM_VPN_CONNECTION_VPN_STATE, "", "",
 		                    NM_VPN_CONNECTION_STATE_UNKNOWN,
diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h
index 7a1d2b0a57..3cfcd30617 100644
--- a/src/vpn-manager/nm-vpn-connection.h
+++ b/src/vpn-manager/nm-vpn-connection.h
@@ -38,7 +38,6 @@
 /* Properties */
 #define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 #define NM_VPN_CONNECTION_BANNER "banner"
-#define NM_VPN_CONNECTION_INT_PLUGIN_INFO "int-plugin-info"
 
 /* Signals */
 /* not exported: includes old reason code */
@@ -73,7 +72,6 @@ typedef struct {
 GType nm_vpn_connection_get_type (void);
 
 NMVpnConnection * nm_vpn_connection_new (NMSettingsConnection *settings_connection,
-                                         NMVpnPluginInfo *plugin_info,
                                          NMDevice *parent_device,
                                          const char *specific_object,
                                          NMAuthSubject *subject);
@@ -83,7 +81,7 @@ void                 nm_vpn_connection_activate        (NMVpnConnection *self,
                                                         GError **error);
 NMVpnConnectionState nm_vpn_connection_get_vpn_state   (NMVpnConnection *self);
 const char *         nm_vpn_connection_get_banner      (NMVpnConnection *self);
-const char *         nm_vpn_connection_get_service     (NMVpnConnection *self);
+const gchar *        nm_vpn_connection_get_service     (NMVpnConnection *self);
 
 gboolean             nm_vpn_connection_deactivate      (NMVpnConnection *self,
                                                         NMVpnConnectionStateReason reason,