diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-06 23:53:27 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-06 23:53:27 +0000 |
| commit | df008ef97deacd5bb00ac335e5d8671798fa09dd (patch) | |
| tree | 806477f545a05128aa17f6981d4f6185cf7587fe /bus/activation.c | |
| parent | 856361ff5b8ce701cdb447085931d3076ee52008 (diff) | |
2003-04-06 Havoc Pennington <hp@pobox.com>
* dbus/Makefile.am: split lists of sources into stuff that goes in
the library, util functions that go in the lib and are also used
elsewhere, and util functions that are used in tests/daemon but
don't go in the lib.
* dbus/dbus-mainloop.h, dbus/dbus-mainloop.c: move bus/loop.[hc]
here so it can be used in test binaries also
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/bus/activation.c b/bus/activation.c index 54ddd948..425d9c19 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -90,7 +90,7 @@ handle_timeout_callback (DBusTimeout *timeout, BusPendingActivation *pending_activation = data; while (!dbus_timeout_handle (pending_activation->timeout)) - bus_wait_for_memory (); + _dbus_wait_for_memory (); } static void @@ -103,9 +103,9 @@ bus_pending_activation_free (BusPendingActivation *pending_activation) if (pending_activation->timeout_added) { - bus_loop_remove_timeout (bus_context_get_loop (pending_activation->activation->context), - pending_activation->timeout, - handle_timeout_callback, pending_activation); + _dbus_loop_remove_timeout (bus_context_get_loop (pending_activation->activation->context), + pending_activation->timeout, + handle_timeout_callback, pending_activation); pending_activation->timeout_added = FALSE; } @@ -604,7 +604,7 @@ pending_activation_failed (BusPendingActivation *pending_activation, { /* FIXME use preallocated OOM messages instead of bus_wait_for_memory() */ while (!try_send_activation_failure (pending_activation, how)) - bus_wait_for_memory (); + _dbus_wait_for_memory (); /* Destroy this pending activation */ _dbus_hash_table_remove_string (pending_activation->activation->pending_activations, @@ -650,9 +650,9 @@ add_babysitter_watch (DBusWatch *watch, { BusPendingActivation *pending_activation = data; - return bus_loop_add_watch (bus_context_get_loop (pending_activation->activation->context), - watch, babysitter_watch_callback, pending_activation, - NULL); + return _dbus_loop_add_watch (bus_context_get_loop (pending_activation->activation->context), + watch, babysitter_watch_callback, pending_activation, + NULL); } static void @@ -661,8 +661,8 @@ remove_babysitter_watch (DBusWatch *watch, { BusPendingActivation *pending_activation = data; - bus_loop_remove_watch (bus_context_get_loop (pending_activation->activation->context), - watch, babysitter_watch_callback, pending_activation); + _dbus_loop_remove_watch (bus_context_get_loop (pending_activation->activation->context), + watch, babysitter_watch_callback, pending_activation); } static dbus_bool_t @@ -806,11 +806,11 @@ bus_activation_activate_service (BusActivation *activation, return FALSE; } - if (!bus_loop_add_timeout (bus_context_get_loop (activation->context), - pending_activation->timeout, - handle_timeout_callback, - pending_activation, - NULL)) + if (!_dbus_loop_add_timeout (bus_context_get_loop (activation->context), + pending_activation->timeout, + handle_timeout_callback, + pending_activation, + NULL)) { BUS_SET_OOM (error); bus_pending_activation_free (pending_activation); |