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-bus.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-bus.c')
| -rw-r--r-- | dbus/dbus-bus.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index 7b609d67..4dd2eaf9 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -713,7 +713,7 @@ dbus_bus_service_exists (DBusConnection *connection, DBusError *error) { DBusMessage *message, *reply; - unsigned int exists; + dbus_bool_t exists; _dbus_return_val_if_fail (connection != NULL, FALSE); _dbus_return_val_if_fail (service_name != NULL, FALSE); @@ -752,10 +752,12 @@ dbus_bus_service_exists (DBusConnection *connection, DBUS_TYPE_INVALID)) { _DBUS_ASSERT_ERROR_IS_SET (error); + dbus_message_unref (reply); return FALSE; } - return (exists != FALSE); + dbus_message_unref (reply); + return exists; } /** |