diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dbus/dbus-connection.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2006-04-19 John (J5) Palmieri <johnp@redhat.com> + * dbus/dbus-connection.c: Fix asserts + Patch from Tim Moloney <t.moloney at verizon.net> + +2006-04-19 John (J5) Palmieri <johnp@redhat.com> + * mono/Connection.cs, mono/Message.cs: Check Target type Patch from Aaron Bockover (abockover at novell.com) 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); } |