diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-17 20:25:33 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-17 20:25:33 +0000 |
| commit | 4219b08bfa318443419c7a3acde28f0b237b05fe (patch) | |
| tree | 268ad40f508ed47d1951e28cdef69b5489347bb2 /bus | |
| parent | dac0a1f8933889fd94fed7fecdcc4ec6fb3a3fb0 (diff) | |
2003-04-17 Havoc Pennington <hp@redhat.com>
* dbus/dbus-mainloop.c (_dbus_loop_iterate): fix logic so that if
there was an OOM watch we skipped, we always return TRUE so we
iterate again to have a look at it again. Fixes test suite hang.
Code rearrangement also lets us lose some memset and only iterate
over callbacks once.
* bus/driver.c (bus_driver_handle_message): sense of test for
reply was backward
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/dispatch.c | 4 | ||||
| -rw-r--r-- | bus/driver.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index 595db33b..11fe515c 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -1922,7 +1922,7 @@ bus_dispatch_test (const DBusString *test_data_dir) _dbus_assert_not_reached ("initial connection setup failed"); } - check1_try_iterations (context, "create_and_hello_sha1", + check1_try_iterations (context, "create_and_hello", check_hello_connection); check2_try_iterations (context, foo, "nonexistent_service_activation", @@ -1978,7 +1978,7 @@ bus_dispatch_sha1_test (const DBusString *test_data_dir) _dbus_assert_not_reached ("initial connection setup failed"); } - check1_try_iterations (context, "create_and_hello", + check1_try_iterations (context, "create_and_hello_sha1", check_hello_connection); kill_client_connection_unchecked (foo); diff --git a/bus/driver.c b/bus/driver.c index 0d8b9442..c52020b5 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -620,7 +620,7 @@ bus_driver_handle_message (DBusConnection *connection, return FALSE; } - if (dbus_message_get_reply_serial (message) != 0) + if (dbus_message_get_reply_serial (message) == 0) { _dbus_verbose ("Client sent a reply to the bus driver, ignoring it\n"); return TRUE; |