From fe9893510411baff9cb700bea3d37fd19312d02f Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Wed, 19 Apr 2006 19:08:23 +0000 Subject: 2006-04-19 John (J5) Palmieri * dbus/dbus-connection.c: Fix asserts Patch from Tim Moloney --- ChangeLog | 5 +++++ dbus/dbus-connection.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 710f7f7b..3a7bfa04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-19 John (J5) Palmieri + + * dbus/dbus-connection.c: Fix asserts + Patch from Tim Moloney + 2006-04-19 John (J5) Palmieri * mono/Connection.cs, mono/Message.cs: Check Target type diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index b84491bc..db6723b3 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -2890,8 +2890,6 @@ _dbus_connection_read_write_dispatch (DBusConnection *connection, DBusDispatchStatus dstatus; dbus_bool_t dispatched_disconnected; - _dbus_return_val_if_fail (connection != NULL, FALSE); - _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE); dstatus = dbus_connection_get_dispatch_status (connection); if (dispatch && dstatus == DBUS_DISPATCH_DATA_REMAINS) @@ -2963,6 +2961,8 @@ dbus_bool_t dbus_connection_read_write_dispatch (DBusConnection *connection, int timeout_milliseconds) { + _dbus_return_val_if_fail (connection != NULL, FALSE); + _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE); return _dbus_connection_read_write_dispatch(connection, timeout_milliseconds, TRUE); } @@ -2986,6 +2986,8 @@ dbus_bool_t dbus_connection_read_write (DBusConnection *connection, int timeout_milliseconds) { + _dbus_return_val_if_fail (connection != NULL, FALSE); + _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE); return _dbus_connection_read_write_dispatch(connection, timeout_milliseconds, FALSE); } -- cgit