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/dispatch.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/dispatch.c')
| -rw-r--r-- | bus/dispatch.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index 2e0fa9d2..ce0d71c6 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -29,7 +29,6 @@ #include "utils.h" #include "bus.h" #include "test.h" -#include "loop.h" #include <dbus/dbus-internals.h> #include <string.h> @@ -176,7 +175,7 @@ bus_dispatch (DBusConnection *connection, * until we can. */ while (!bus_connection_preallocate_oom_error (connection)) - bus_wait_for_memory (); + _dbus_wait_for_memory (); /* Ref connection in case we disconnect it at some point in here */ dbus_connection_ref (connection); @@ -537,7 +536,7 @@ kill_client_connection (BusContext *context, _dbus_assert (s != NULL); while ((base_service = _dbus_strdup (s)) == NULL) - bus_wait_for_memory (); + _dbus_wait_for_memory (); dbus_connection_ref (connection); @@ -805,7 +804,7 @@ check_hello_message (BusContext *context, { _dbus_verbose ("no memory to get service name arg from hello\n"); dbus_error_free (&error); - bus_wait_for_memory (); + _dbus_wait_for_memory (); goto retry_get_hello_name; } else @@ -819,7 +818,7 @@ check_hello_message (BusContext *context, _dbus_verbose ("Got hello name: %s\n", name); while (!dbus_bus_set_base_service (connection, name)) - bus_wait_for_memory (); + _dbus_wait_for_memory (); scd.skip_connection = NULL; scd.failed = FALSE; @@ -849,7 +848,7 @@ check_hello_message (BusContext *context, { _dbus_verbose ("no memory to get service name arg from acquired\n"); dbus_error_free (&error); - bus_wait_for_memory (); + _dbus_wait_for_memory (); goto retry_get_acquired_name; } else |