diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2006-07-22 17:06:14 +0000 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2006-07-22 17:06:14 +0000 |
commit | da127218174e212476f9ca8c4a937fdbc24561cb (patch) | |
tree | 4685633ac1218f81905958b4fc0b54d1a3cfa9ea /dbus | |
parent | 4bf50e206c18e118f899693fb71c9f8e6adddcbd (diff) |
* 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
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-connection.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |