diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dbus/dbus-connection.c | 4 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2006-07-22 John (J5) Palmieri <johnp@redhat.com> + + * dbus/dbus-connection.c: + (_dbus_connection_attach_pending_call_unlocked): + (connection_timeout_and_complete_all_pending_calls_unlocked): + Make sure we set timeout_added on pending calls to FALSE when + we remove the timeout from the connection + 2006-07-21 John (J5) Palmieri <johnp@redhat.com> * Removed some extra bindings stuff lingering around (thanks timo) diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index fd80ac11..3fa798f4 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -798,6 +798,7 @@ _dbus_connection_attach_pending_call_unlocked (DBusConnection *connection, { _dbus_connection_remove_timeout_unlocked (connection, timeout); + _dbus_pending_call_set_timeout_added (pending, FALSE); HAVE_LOCK_CHECK (connection); return FALSE; } @@ -2501,7 +2502,8 @@ connection_timeout_and_complete_all_pending_calls_unlocked (DBusConnection *conn connection); _dbus_connection_remove_timeout_unlocked (connection, _dbus_pending_call_get_timeout (pending)); - + + _dbus_pending_call_set_timeout_added (pending, FALSE); _dbus_hash_iter_remove_entry (&iter); dbus_pending_call_unref (pending); |