summaryrefslogtreecommitdiff
path: root/gdbus
diff options
context:
space:
mode:
authorGrant Erickson <marathon96@gmail.com>2011-03-03 18:45:06 (GMT)
committerMarcel Holtmann <marcel@holtmann.org>2011-03-09 21:33:33 (GMT)
commit7486e2fd589c4e6e571132b63bc9491c62b6e19f (patch)
tree84e43f6b3cb5e50d6490e52d924a51494e6c71c4 /gdbus
parentd710cf998faf08465bccb65c5897eb37c1ced306 (diff)
downloadconnman-7486e2fd589c4e6e571132b63bc9491c62b6e19f.zip
connman-7486e2fd589c4e6e571132b63bc9491c62b6e19f.tar.gz
connman-7486e2fd589c4e6e571132b63bc9491c62b6e19f.tar.bz2
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.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c
index 8eef240..8718da0 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);
}