fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 21:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: remove un-needed NMActRequest from VPN connection creation

Browse source 
It's not required for anything.
This commit is contained in:
Dan Williams 2011-04-13 15:37:22 -05:00
parent 8407a9f92c
commit 832e64f8bc
7 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nm-manager.c
View file

@ -1933,7 +1933,6 @@ nm_manager_activate_connection (NMManager *manager,
vpn_connection = nm_vpn_manager_activate_connection (priv->vpn_manager,
connection,
parent_req,
device,
TRUE,
sender_uid,

5
src/vpn-manager/nm-vpn-connection.c
View file

@ -60,7 +60,6 @@ typedef struct {
gboolean user_requested;
gulong user_uid;
NMActRequest *act_request;
guint32 secrets_id;
char *username;
@ -201,7 +200,6 @@ device_ip4_config_changed (NMDevice *device,
NMVPNConnection *
nm_vpn_connection_new (NMConnection *connection,
NMActRequest *act_request,
NMDevice *parent_device,
gboolean user_requested,
gulong user_uid)
@ -210,7 +208,6 @@ nm_vpn_connection_new (NMConnection *connection,
NMVPNConnectionPrivate *priv;
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 (parent_device), NULL);
self = (NMVPNConnection *) g_object_new (NM_TYPE_VPN_CONNECTION, NULL);
@ -223,7 +220,6 @@ nm_vpn_connection_new (NMConnection *connection,
priv->user_uid = user_uid;
priv->connection = g_object_ref (connection);
priv->parent_dev = g_object_ref (parent_device);
priv->act_request = g_object_ref (act_request);
priv->device_monitor = g_signal_connect (parent_device, "state-changed",
G_CALLBACK (device_state_changed),
@ -1074,7 +1070,6 @@ dispose (GObject *object)
priv->secrets_id);
}
g_object_unref (priv->act_request);
g_object_unref (priv->connection);
g_free (priv->username);

2
src/vpn-manager/nm-vpn-connection.h
View file

@ -26,7 +26,6 @@
#include <glib-object.h>
#include "NetworkManagerVPN.h"
#include "nm-device.h"
#include "nm-activation-request.h"
#include "nm-vpn-connection-base.h"
#define NM_TYPE_VPN_CONNECTION (nm_vpn_connection_get_type ())
@ -57,7 +56,6 @@ typedef struct {
GType nm_vpn_connection_get_type (void);
NMVPNConnection * nm_vpn_connection_new (NMConnection *connection,
NMActRequest *act_request,
NMDevice *parent_device,
gboolean user_requested,
gulong user_uid);

4
src/vpn-manager/nm-vpn-manager.c
View file

@ -161,7 +161,6 @@ connection_vpn_state_changed (NMVPNConnection *connection,
NMVPNConnection *
nm_vpn_manager_activate_connection (NMVPNManager *manager,
NMConnection *connection,
NMActRequest *act_request,
NMDevice *device,
gboolean user_requested,
gulong user_uid,
@ -174,7 +173,6 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager,
g_return_val_if_fail (NM_IS_VPN_MANAGER (manager), 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);
@ -211,7 +209,7 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager,
return NULL;
}
vpn = nm_vpn_service_activate (service, connection, act_request, device, user_requested, user_uid, error);
vpn = nm_vpn_service_activate (service, connection, device, user_requested, user_uid, error);
if (vpn) {
g_signal_connect (vpn, "vpn-state-changed",
G_CALLBACK (connection_vpn_state_changed),

2
src/vpn-manager/nm-vpn-manager.h
View file

@ -25,7 +25,6 @@
#include <glib.h>
#include <glib-object.h>
#include "nm-vpn-connection.h"
#include "nm-activation-request.h"
#define NM_TYPE_VPN_MANAGER (nm_vpn_manager_get_type ())
#define NM_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_MANAGER, NMVPNManager))
@ -69,7 +68,6 @@ NMVPNManager *nm_vpn_manager_get (void);
NMVPNConnection *nm_vpn_manager_activate_connection (NMVPNManager *manager,
NMConnection *connection,
NMActRequest *act_request,
NMDevice *device,
gboolean user_requested,
gulong user_uid,

4
src/vpn-manager/nm-vpn-service.c
View file

@ -323,7 +323,6 @@ 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,
@ -334,7 +333,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 +341,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, user_requested, user_uid);
g_signal_connect (vpn, "vpn-state-changed",
G_CALLBACK (connection_vpn_state_changed),
service);

2
src/vpn-manager/nm-vpn-service.h
View file

@ -26,7 +26,6 @@
#include <glib-object.h>
#include "nm-device.h"
#include "nm-vpn-connection.h"
#include "nm-activation-request.h"
#define NM_TYPE_VPN_SERVICE (nm_vpn_service_get_type ())
#define NM_VPN_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_SERVICE, NMVPNService))
@ -57,7 +56,6 @@ const char *nm_vpn_service_get_name_file (NMVPNService *service);
NMVPNConnection * nm_vpn_service_activate (NMVPNService *service,
NMConnection *connection,
NMActRequest *act_request,
NMDevice *device,
gboolean user_requested,
gulong user_uid,