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.

diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c
index 8eef240..8718da0 100644 (file)
--- 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);
 }