diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2011-01-14 16:14:20 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-01-19 17:26:06 +0100 |
| commit | a0b7b278254d886b0d9e233004f9db1f30a19ce7 (patch) | |
| tree | d4e05b13feb44e1b00bda7d2cb6cb6154cc61f3f | |
| parent | ad820ae97c2ede8ca4e4670c68379318d757fddb (diff) | |
| download | pacrunner-a0b7b278254d886b0d9e233004f9db1f30a19ce7.tar.gz | |
gdbus: invaldate_parent_data: walk the whole path down
Assume there is only one object registerd at "/". If we add a new
object at "/foo/bar" the introspection of "/" has to be updated. A new
node has to be added at "/".
invalidate_parent_data stops invaldating the whole path because the
boolean return value of dbus_connection_get_object_path_data is used
wrong.
If we get a TRUE just go on down in the path, if FALSE is return
dbus_connection_get_object_path_data has run out of memory.
| -rw-r--r-- | gdbus/object.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index afa904e..49006ec 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -475,12 +475,13 @@ static void invalidate_parent_data(DBusConnection *conn, const char *child_path) if (!strlen(parent_path)) goto done; - if (!dbus_connection_get_object_path_data(conn, parent_path, - (void *) &data)) { - invalidate_parent_data(conn, parent_path); + if (dbus_connection_get_object_path_data(conn, parent_path, + (void *) &data) == FALSE) { goto done; } + invalidate_parent_data(conn, parent_path); + if (data == NULL) goto done; |