diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-07 15:03:56 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-07 15:04:25 +0000 |
| commit | 88498b706a39bbe520f9591d8d52b54fb1f8e378 (patch) | |
| tree | 5243eb3c97b8039d0ff43cd7121a632bbdb9d3bc /bus/activation.c | |
| parent | b816cb6e900073c6a6126687f2102dfd8e594e68 (diff) | |
| parent | 3f4ed9def33c359142c340f28345755ca37663f2 (diff) | |
| download | dbus-88498b706a39bbe520f9591d8d52b54fb1f8e378.tar.gz | |
Merge branch 'socket-set-33337'
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33337
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/bus/activation.c b/bus/activation.c index 2744e214..3dfba787 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -1427,6 +1427,16 @@ remove_babysitter_watch (DBusWatch *watch, watch); } +static void +toggle_babysitter_watch (DBusWatch *watch, + void *data) +{ + BusPendingActivation *pending_activation = data; + + _dbus_loop_toggle_watch (bus_context_get_loop (pending_activation->activation->context), + watch); +} + static dbus_bool_t pending_activation_timed_out (void *data) { @@ -2110,7 +2120,7 @@ bus_activation_activate_service (BusActivation *activation, if (!_dbus_babysitter_set_watch_functions (pending_activation->babysitter, add_babysitter_watch, remove_babysitter_watch, - NULL, + toggle_babysitter_watch, pending_activation, NULL)) { |