From e37fcb4af343e8eb97b9f888fd821de4c9432f70 Mon Sep 17 00:00:00 2001 From: Grant Erickson Date: Thu, 3 Mar 2011 10:45:06 -0800 Subject: [PATCH] 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. --- gdbus/mainloop.c | 3 --- 1 file changed, 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); }