Imported Upstream version 0.9.10.0 upstream/0.9.10.0

1 files changed, 5 insertions, 13 deletions

diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h
index e883d55f..4545d1f0 100644
--- a/src/vpn-manager/nm-vpn-service.h
+++ b/src/vpn-manager/nm-vpn-service.h
@@ -34,8 +34,6 @@
 #define NM_IS_VPN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_SERVICE))
 #define NM_VPN_SERVICE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_SERVICE, NMVPNServiceClass))
 
-#define VPN_CONNECTION_GROUP "VPN Connection"
-
 typedef struct {
 	GObject parent;
 } NMVPNService;
@@ -54,18 +52,12 @@ const char *nm_vpn_service_get_dbus_service (NMVPNService *service);
 /* Returns the path of the VPN service's .name file */
 const char *nm_vpn_service_get_name_file (NMVPNService *service);
 
-NMVPNConnection * nm_vpn_service_activate (NMVPNService *service,
-                                           NMConnection *connection,
-                                           NMDevice *device,
-                                           const char *specific_object,
-                                           gboolean user_requested,
-                                           gulong user_uid,
-                                           GError **error);
-
-const GSList *nm_vpn_service_get_active_connections (NMVPNService *service);
+gboolean nm_vpn_service_activate (NMVPNService *service,
+                                  NMVPNConnection *vpn,
+                                  GError **error);
 
-void nm_vpn_service_connections_stop (NMVPNService *service,
-                                      gboolean fail,
+void nm_vpn_service_stop_connections (NMVPNService *service,
+                                      gboolean quitting,
                                       NMVPNConnectionStateReason reason);
 
 #endif  /* NM_VPN_VPN_SERVICE_H */