diff options
Diffstat (limited to 'src/vpn-manager/nm-vpn-service.c')
| -rw-r--r-- | src/vpn-manager/nm-vpn-service.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c index 3b4e2b481..68cfadb72 100644 --- a/src/vpn-manager/nm-vpn-service.c +++ b/src/vpn-manager/nm-vpn-service.c @@ -323,10 +323,7 @@ connection_vpn_state_changed (NMVPNConnection *connection, NMVPNConnection * nm_vpn_service_activate (NMVPNService *service, NMConnection *connection, - NMActRequest *act_request, NMDevice *device, - gboolean user_requested, - gulong user_uid, GError **error) { NMVPNConnection *vpn; @@ -334,7 +331,6 @@ nm_vpn_service_activate (NMVPNService *service, g_return_val_if_fail (NM_IS_VPN_SERVICE (service), NULL); g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); - g_return_val_if_fail (NM_IS_ACT_REQUEST (act_request), NULL); g_return_val_if_fail (NM_IS_DEVICE (device), NULL); g_return_val_if_fail (error != NULL, NULL); g_return_val_if_fail (*error == NULL, NULL); @@ -343,7 +339,7 @@ nm_vpn_service_activate (NMVPNService *service, clear_quit_timeout (service); - vpn = nm_vpn_connection_new (connection, act_request, device, user_requested, user_uid); + vpn = nm_vpn_connection_new (connection, device); g_signal_connect (vpn, "vpn-state-changed", G_CALLBACK (connection_vpn_state_changed), service); @@ -417,8 +413,7 @@ nm_vpn_service_init (NMVPNService *self) NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); priv->dbus_mgr = nm_dbus_manager_get (); - priv->name_owner_id = g_signal_connect (priv->dbus_mgr, - NM_DBUS_MANAGER_NAME_OWNER_CHANGED, + priv->name_owner_id = g_signal_connect (priv->dbus_mgr, "name-owner-changed", G_CALLBACK (nm_vpn_service_name_owner_changed), self); } |