diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-05-16 21:27:04 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2005-05-16 21:27:04 +0000 |
| commit | 63ac302bab3fee5abf0241b160bc51792511de5d (patch) | |
| tree | d70dcb7cc9176841949145041fed490078751af2 /glib | |
| parent | ad5bafed044278dac991924dcde2a49cc2850b26 (diff) | |
* glib/dbus-gmain.c (io_handler_dispatch): fix deadlock
when using recursive g_main_loops
* python/_dbus.py (class Bus): add the ProxyObjectClass
alias for ProxyObject to make it easier for the Twisted
networking framework to integrate dbus.
* python/proxies.py (class ProxyObject): add the ProxyMethodClass
alias for ProxyMethod to make it easier for the Twisted
networking framework to integrate dbus.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/dbus-gmain.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index b824f01d..046c493c 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -240,13 +240,7 @@ io_handler_dispatch (GIOChannel *source, handler = NULL; if (connection) - { - /* Dispatch messages */ - while (dbus_connection_dispatch (connection) == DBUS_DISPATCH_DATA_REMAINS) - ; - - dbus_connection_unref (connection); - } + dbus_connection_unref (connection); return TRUE; } |