diff options
| author | Olivier Andrieu <oliv__a@users.sourceforge.net> | 2004-07-22 07:07:01 +0000 |
|---|---|---|
| committer | Olivier Andrieu <oliv__a@users.sourceforge.net> | 2004-07-22 07:07:01 +0000 |
| commit | 7eb304c54ee8ea6dfa3775cf89d63c39295747a8 (patch) | |
| tree | 386e2c88c832b386221f2f1cabdedb83c1ef7b49 /dbus/dbus-object-tree.c | |
| parent | c9c0adce43caa00345ad2aeb55822eabde523c2c (diff) | |
2004-07-22 Olivier Andrieu <oliv__a@users.sourceforge.net>
* dbus/dbus-sysdeps.c (fill_user_info): fix inexistent label name,
breaking build on Solaris, reported by Farhad Saberi on the ML.
* dbus/dbus-message.c (dbus_message_append_args_valist): fix the
va_arg invocation to account for integer promotion in the case of
DBUS_TYPE_BYTE (unsigned char is promoted to int). (bug #901)
* bus/services.c (bus_service_remove_owner): fix bug #902, use
_dbus_list_get_first_link, not _dbus_list_get_first.
* dbus/dbus-bus.c (dbus_bus_service_exists): plug a memory leak.
* dbus/dbus-object-tree.c (free_subtree_recurse): always null
handler functions so that the asserts in _dbus_object_subtree_unref
do not fail.
* dbus/dbus-transport-unix.c (do_reading):
_dbus_transport_queue_messages return value is of type
dbus_bool_t, not DBusDispatchStatus.
Diffstat (limited to 'dbus/dbus-object-tree.c')
| -rw-r--r-- | dbus/dbus-object-tree.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c index 3ec97320..4f82d6f5 100644 --- a/dbus/dbus-object-tree.c +++ b/dbus/dbus-object-tree.c @@ -536,13 +536,12 @@ free_subtree_recurse (DBusConnection *connection, /* Call application code */ if (subtree->unregister_function) - { - (* subtree->unregister_function) (connection, - subtree->user_data); - subtree->message_function = NULL; - subtree->unregister_function = NULL; - subtree->user_data = NULL; - } + (* subtree->unregister_function) (connection, + subtree->user_data); + + subtree->message_function = NULL; + subtree->unregister_function = NULL; + subtree->user_data = NULL; /* Now free ourselves */ _dbus_object_subtree_unref (subtree); |