projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d710cf9
)
gdbus: Unconditionally remove D-Bus timeouts
author
Grant Erickson
<marathon96@gmail.com>
Thu, 3 Mar 2011 18:45:06 +0000
(10:45 -0800)
committer
Marcel Holtmann
<marcel@holtmann.org>
Wed, 9 Mar 2011 21:33:33 +0000
(13:33 -0800)
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
patch
|
blob
|
history
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);
}