aboutsummaryrefslogtreecommitdiffstats
path: root/gdbus
diff options
context:
space:
mode:
authorGrant Erickson <marathon96@gmail.com>2011-03-03 10:45:06 -0800
committerMarcel Holtmann <marcel@holtmann.org>2011-03-09 13:34:37 -0800
commit387194965b42b45f036f4a533b9c977a29bf42af (patch)
treebf9b877d12191b48ab6959a21d650fc47e3880f7 /gdbus
parentb6980fdd50fb363b1b5b21a3d6d141d0879f72a6 (diff)
downloadpacrunner-387194965b42b45f036f4a533b9c977a29bf42af.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.
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);
}