Merge commit 'origin/master' into btdun

This commit is contained in:
Dan Williams 2009-10-04 23:39:16 -07:00
commit 821bfe5257

View file

@ -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);