system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 11:14:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnm-glib: fix premature child object signal emission

Browse source 
The notifications for child objects (like NMClient's device-added
signal or NMDeviceWifi's access-point-added signal) could get emitted
before the child objects were actually constructed, because
object_created() decrements the properties-retrieved tracking
variable, which wasn't always incremented before calling that
function.
This commit is contained in:
Dan Winship 2012-02-09 13:25:59 -06:00 committed by Dan Williams
parent c24c4d489f
commit c721477d11
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libnm-glib/nm-object.c
View file

@ -635,6 +635,9 @@ handle_object_property (NMObject *self, const char *property_name, GValue *value
odata->array = FALSE;
odata->property_name = property_name;
if (priv->reload_results)
priv->reload_remaining++;
path = g_value_get_boxed (value);
if (!strcmp (path, "/")) {
object_created (NULL, odata);
@ -651,8 +654,6 @@ handle_object_property (NMObject *self, const char *property_name, GValue *value
return obj != NULL;
}
if (priv->reload_results)
priv->reload_remaining++;
_nm_object_create_async (pi->object_type, priv->connection, path,
object_created, odata);
/* Assume success */
@ -689,6 +690,11 @@ handle_object_array_property (NMObject *self, const char *property_name, GValue
continue;
}
if (add_to_reload) {
priv->reload_remaining++;
add_to_reload = FALSE;
}
obj = G_OBJECT (_nm_object_cache_get (path));
if (obj) {
object_created (obj, odata);
@ -699,10 +705,6 @@ handle_object_array_property (NMObject *self, const char *property_name, GValue
continue;
}
if (add_to_reload) {
priv->reload_remaining++;
add_to_reload = FALSE;
}
_nm_object_create_async (pi->object_type, priv->connection, path,
object_created, odata);
}