2006-04-19 John (J5) Palmieri <johnp@redhat.com>

	* dbus/dbus-connection.c: Fix asserts
	Patch from Tim Moloney <t.moloney at verizon.net>

diff --git a/ChangeLog b/ChangeLog
index 710f7f7b2fee0571a6158eb669093b7df3aa1229..3a7bfa048a28e546ccb41ccb5a5041e7e7711d89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index b84491bcd811cfa29285c084b15563f3fa10da00..db6723b3d9ccbb8020af47196ed0cc3d31d9a165 100644 (file)
--- 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);
 }