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:33:33 -0800 |
| commit | 7486e2fd589c4e6e571132b63bc9491c62b6e19f (patch) | |
| tree | 84e43f6b3cb5e50d6490e52d924a51494e6c71c4 /gdbus | |
| parent | d710cf998faf08465bccb65c5897eb37c1ced306 (diff) | |
| download | connman-7486e2fd589c4e6e571132b63bc9491c62b6e19f.tar.gz connman-7486e2fd589c4e6e571132b63bc9491c62b6e19f.tar.bz2 connman-7486e2fd589c4e6e571132b63bc9491c62b6e19f.zip | |
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.
Diffstat (limited to 'gdbus')
| -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 8eef240b..8718da0f 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); } |