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

* src/vpn-manager: misc. stuff

Browse source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1507 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-02-27 18:30:04 +00:00
parent c4f8012b97
commit bd62301db9
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vpn-manager/nm-vpn-act-request.c
View file

@ -120,7 +120,7 @@ gboolean nm_vpn_act_request_is_activating (NMVPNActRequest *req)
switch (req->stage)
{
case NM_VPN_ACT_STAGE_PREPARE:
case NM_VPN_ACT_STAGE_PREPARE:
case NM_VPN_ACT_STAGE_CONNECT:
case NM_VPN_ACT_STAGE_IP_CONFIG_GET:
activating = TRUE;

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

@ -347,7 +347,7 @@ void nm_vpn_manager_activate_vpn_connection (NMVPNManager *manager, NMVPNConnect
g_return_if_fail (password_items != NULL);
g_return_if_fail (data_items != NULL);
if (manager->act_req)
if (nm_vpn_manager_get_vpn_act_request (manager))
nm_vpn_manager_deactivate_vpn_connection (manager, nm_vpn_act_request_get_parent_dev (manager->act_req));
service_name = nm_vpn_connection_get_service_name (vpn);

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

@ -488,6 +488,7 @@ sanitize_dbus_string_array (char **in_array, dbus_uint32_t *in_num)
return out_array;
}
static gboolean nm_vpn_service_stage3_connect (gpointer user_data)
{
NMVPNActRequest * req = (NMVPNActRequest *) user_data;
@ -838,7 +839,7 @@ static void nm_vpn_service_stop_connection_internal (NMVPNService *service)
dbus_message_unref (message);
}
else
nm_warning ("nm_vpn_service_stop_connection(): error, couldn't allocate dbus message.");
nm_warning ("nm_vpn_service_stop_connection_internal(): error, couldn't allocate dbus message.");
g_free (op);
}
@ -860,8 +861,8 @@ void nm_vpn_service_stop_connection (NMVPNService *service, NMVPNActRequest *req
/* Ensure we can stop the connection in this state */
if ((service->state != NM_VPN_STATE_STARTED) && (service->state != NM_VPN_STATE_STARTING))
{
nm_info ("nm_vpn_service_start_connection(%s): could not stop connection '%s' because service was not STARTED.",
service->service, nm_vpn_connection_get_name (vpn));
nm_info ("nm_vpn_service_stop_connection(%s): could not stop connection '%s' because service was %d.",
service->service, nm_vpn_connection_get_name (vpn), service->state);
return;
}