diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-18 04:18:57 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-18 04:18:57 +0000 |
| commit | 3df260c07102745c5606c313af862558f105f83e (patch) | |
| tree | b0a9d23fc820a3bc61da1cd7e63fc810423a2210 /bus/activation.c | |
| parent | 88cd5da3c0ec86fed29942b062c2f7bf0f8fda44 (diff) | |
2003-04-18 Havoc Pennington <hp@pobox.com>
* glib/dbus-gmain.c: adapt to watch changes
* bus/bus.c, bus/activation.c, etc.: adjust to watch changes
* dbus/dbus-server.h: remove dbus_server_handle_watch
* dbus/dbus-connection.h: remove dbus_connection_handle_watch
* dbus/dbus-watch.c (dbus_watch_handle): change DBusWatch to work
like DBusTimeout, so we don't need dbus_connection_handle_watch
etc.
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/bus/activation.c b/bus/activation.c index 0a70d6b1..a569e1a1 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -706,8 +706,18 @@ babysitter_watch_callback (DBusWatch *watch, _dbus_babysitter_ref (babysitter); - retval = _dbus_babysitter_handle_watch (babysitter, watch, condition); - + retval = dbus_watch_handle (watch, condition); + + /* FIXME this is broken in the same way that + * connection watches used to be; there should be + * a separate callback for status change, instead + * of doing "if we handled a watch status might + * have changed" + * + * Fixing this lets us move dbus_watch_handle + * calls into dbus-mainloop.c + */ + if (_dbus_babysitter_get_child_exited (babysitter)) { DBusError error; |