From: Grant Erickson <marathon96@gmail.com>
Date: Thu, 3 Mar 2011 18:45:06 +0000 (-0800)
Subject: gdbus: Unconditionally remove D-Bus timeouts
X-Git-Tag: 2.0_alpha~1663
X-Git-Url: http://review.tizen.org/git/?p=framework%2Fconnectivity%2Fconnman.git;a=commitdiff_plain;h=7486e2fd589c4e6e571132b63bc9491c62b6e19f

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
--- 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);
 }