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

vpn: cancel the right secrets request

Browse source 
Code still called nm_act_request_cancel_secrets() but the VPN
connection no longers uses the underlying activation request for
secrets.  Fix that.
This commit is contained in:
Dan Williams 2011-03-17 12:23:59 -05:00
parent 4fca276e9a
commit 05f70e34a5
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -762,17 +762,6 @@ nm_vpn_connection_disconnect (NMVPNConnection *connection,
/******************************************************************************/
static void
cancel_get_secrets (NMVPNConnection *self)
{
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
if (priv->secrets_id) {
nm_settings_connection_cancel_secrets (NM_SETTINGS_CONNECTION (priv->connection), priv->secrets_id);
priv->secrets_id = 0;
}
}
static void
vpn_secrets_cb (NMSettingsConnection *connection,
guint32 call_id,
@ -973,7 +962,11 @@ connection_state_changed (NMVPNConnection *self,
{
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
cancel_get_secrets (self);
/* Clear any in-progress secrets request */
if (priv->secrets_id) {
nm_settings_connection_cancel_secrets (NM_SETTINGS_CONNECTION (priv->connection), priv->secrets_id);
priv->secrets_id = 0;
}
switch (state) {
case NM_VPN_CONNECTION_STATE_NEED_AUTH:
@ -1041,8 +1034,10 @@ dispose (GObject *object)
if (priv->proxy)
g_object_unref (priv->proxy);
if (priv->secrets_id)
nm_act_request_cancel_secrets (priv->act_request, priv->secrets_id);
if (priv->secrets_id) {
nm_settings_connection_cancel_secrets (NM_SETTINGS_CONNECTION (priv->connection),
priv->secrets_id);
}
g_object_unref (priv->act_request);
g_object_unref (priv->connection);