fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-03 19:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix inverted return value from dbus_connection_read_write()

Browse source 
* dbus/dbus-connection.c (_dbus_connection_read_write_dispatch):
      The double negation re no_progress_possible was obviously too
      confusing: the path for dispatch = FALSE would return an inverted
      status. So make it progress_possible and fix the logic.

Signed-off-by: Thiago Macieira <thiago@kde.org>
This commit is contained in:
Oswald Buddenhagen 2008-06-07 17:24:50 +02:00 • committed by Thiago Macieira
parent cdca6dbce8
commit d7bb3cf8df
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dbus/dbus-connection.c
View file

@ -3412,6 +3412,7 @@ _dbus_connection_read_write_dispatch (DBusConnection *connection,
{
DBusDispatchStatus dstatus;
dbus_bool_t no_progress_possible;
dbus_bool_t progress_possible;
dstatus = dbus_connection_get_dispatch_status (connection);
@ -3447,12 +3448,13 @@ _dbus_connection_read_write_dispatch (DBusConnection *connection,
* as long as the transport is open.
*/
if (dispatch)
no_progress_possible = connection->n_incoming == 0 &&
connection->disconnect_message_link == NULL;
progress_possible = connection->n_incoming != 0 ||
connection->disconnect_message_link != NULL;
else
no_progress_possible = _dbus_connection_get_is_connected_unlocked (connection);
progress_possible = _dbus_connection_get_is_connected_unlocked (connection);
CONNECTION_UNLOCK (connection);
return !no_progress_possible; /* TRUE if we can make more progress */
return progress_possible; /* TRUE if we can make more progress */
}