diff options
| author | Grant Erickson <marathon96@gmail.com> | 2011-03-03 10:45:06 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-03-09 13:34:03 -0800 |
| commit | af4519a50cb8fc0be3398089aa3a85904453de1d (patch) | |
| tree | 7baea8dfe6b2a76ad43b592ba694af7d93667dfa | |
| parent | dc920afdf5a9ee58181d094f96def64f15b65207 (diff) | |
| download | bluez-af4519a50cb8fc0be3398089aa3a85904453de1d.tar.gz | |
gdbus: Unconditionally remove D-Bus timeouts
Address an issue in which the daemon incorrectly handles D-Bus main
loop timeouts by only removing timeouts that are not enabled when
D-Bus requests a timeout removal.
| -rw-r--r-- | gdbus/mainloop.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c index 8eef240b8..8718da0f7 100644 --- a/gdbus/mainloop.c +++ b/gdbus/mainloop.c @@ -230,9 +230,6 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data) static void remove_timeout(DBusTimeout *timeout, void *data) { - if (dbus_timeout_get_enabled(timeout)) - return; - /* will trigger timeout_handler_free() */ dbus_timeout_set_data(timeout, NULL, NULL); } |