fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 14:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "core: fix warning about pending action "autoactivate""

Browse source 
This change removed the "autoactivate" pending action too soon,
creating a window where the device had no pending actions, allowing
the manager to declare startup complete while devices were still being
activated.

This reverts commit a16b7a8253.
This commit is contained in:
Dan Winship 2014-02-13 14:25:30 -05:00
parent a217a742f1
commit 93285054ae
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nm-policy.c
View file

@ -937,10 +937,10 @@ typedef struct {
static void
activate_data_free (ActivateData *data)
{
if (data->autoactivate_id) {
nm_device_remove_pending_action (data->device, "autoactivate");
nm_device_remove_pending_action (data->device, "autoactivate");
if (data->autoactivate_id)
g_source_remove (data->autoactivate_id);
}
g_object_unref (data->device);
memset (data, 0, sizeof (*data));
g_free (data);
@ -960,9 +960,8 @@ auto_activate_device (gpointer user_data)
policy = data->policy;
priv = NM_POLICY_GET_PRIVATE (policy);
priv->pending_activation_checks = g_slist_remove (priv->pending_activation_checks, data);
data->autoactivate_id = 0;
nm_device_remove_pending_action (data->device, "autoactivate");
priv->pending_activation_checks = g_slist_remove (priv->pending_activation_checks, data);
// FIXME: if a device is already activating (or activated) with a connection
// but another connection now overrides the current one for that device,