diff options
author | Luiz Augusto von Dentz <luiz.dentz-von@nokia.com> | 2010-10-13 15:06:46 +0300 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-10-13 15:56:15 +0300 |
commit | c18993abebff922c3464362f483631f9962532b3 (patch) | |
tree | 8ea9e496e7916c697aac0a484ce7a7dbeaea56d0 /gdbus | |
parent | db8ab492ed63a1c6f2ab7cbc6d9c1c46de8c0685 (diff) | |
download | pacrunner-c18993abebff922c3464362f483631f9962532b3.tar.gz |
Fix not handling of D-Bus disconnects
We where not dispatching data when a bus disconnects which cause
Disconnected signal to not be processed and thus causing the process to
either not exit or to not trigger callbacks registered with
g_dbus_set_disconnect_function.
To fix this now we always schedule a dispatch which will make sure data
still not processed will make its way to the proper handlers even if
disconnected.
Diffstat (limited to 'gdbus')
-rw-r--r-- | gdbus/mainloop.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c index ec10ab0..862c434 100644 --- a/gdbus/mainloop.c +++ b/gdbus/mainloop.c @@ -95,6 +95,7 @@ static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data) { struct watch_info *info = data; unsigned int flags = 0; + DBusDispatchStatus status; dbus_connection_ref(info->conn); @@ -105,6 +106,9 @@ static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data) dbus_watch_handle(info->watch, flags); + status = dbus_connection_get_dispatch_status(info->conn); + queue_dispatch(info->conn, status); + dbus_connection_unref(info->conn); return TRUE; |