mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-18 00:10:35 +01:00
Merge commit 'origin/master' into btdun
This commit is contained in:
commit
821bfe5257
1 changed files with 2 additions and 2 deletions
|
|
@ -1211,8 +1211,6 @@ add_device (NMManager *self, NMDevice *device)
|
|||
gpointer value;
|
||||
gboolean managed = FALSE;
|
||||
|
||||
priv->devices = g_slist_append (priv->devices, device);
|
||||
|
||||
iface = nm_device_get_ip_iface (device);
|
||||
g_assert (iface);
|
||||
|
||||
|
|
@ -1221,6 +1219,8 @@ add_device (NMManager *self, NMDevice *device)
|
|||
return;
|
||||
}
|
||||
|
||||
priv->devices = g_slist_append (priv->devices, device);
|
||||
|
||||
g_signal_connect (device, "state-changed",
|
||||
G_CALLBACK (manager_device_state_changed),
|
||||
self);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue