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

core: simplify device disconnect flow

Browse source
This commit is contained in:
Dan Williams 2010-11-17 17:02:21 -06:00
parent 1064397904
commit 98dab62d92
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/nm-manager.c
View file

@ -1192,34 +1192,32 @@ deactivate_disconnect_check_error (GError *auth_error,
static void
disconnect_net_auth_done_cb (NMAuthChain *chain,
GError *error,
GError *auth_error,
DBusGMethodInvocation *context,
gpointer user_data)
{
NMManager *self = NM_MANAGER (user_data);
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
GError *ret_error = NULL;
GError *error = NULL;
NMAuthCallResult result;
NMDevice *device;
priv->auth_chains = g_slist_remove (priv->auth_chains, chain);
result = GPOINTER_TO_UINT (nm_auth_chain_get_data (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL));
ret_error = deactivate_disconnect_check_error (error, result, "Disconnect");
if (ret_error) {
dbus_g_method_return_error (context, ret_error);
g_error_free (ret_error);
goto done;
error = deactivate_disconnect_check_error (auth_error, result, "Disconnect");
if (!error) {
device = nm_auth_chain_get_data (chain, "device");
if (!nm_device_interface_disconnect (NM_DEVICE_INTERFACE (device), &error))
g_assert (error);
}
device = nm_auth_chain_get_data (chain, "device");
if (!nm_device_interface_disconnect (NM_DEVICE_INTERFACE (device), &ret_error)) {
dbus_g_method_return_error (context, ret_error);
g_clear_error (&ret_error);
} else
if (error)
dbus_g_method_return_error (context, error);
else
dbus_g_method_return (context);
done:
g_clear_error (&error);
nm_auth_chain_unref (chain);
}