2003-04-03 Havoc Pennington <hp@redhat.com>

	* bus/loop.h, bus/loop.c: make the mainloop an object so we can
	have multiple ones

	* bus/*.[hc]: adapt to mainloop change

1 files changed, 13 insertions, 11 deletions

diff --git a/bus/test.h b/bus/test.h
index d8ab67b8..5606bb99 100644
--- a/bus/test.h
+++ b/bus/test.h
@@ -32,17 +32,19 @@
 #include <dbus/dbus-string.h>
 #include "connection.h"
 
-dbus_bool_t bus_dispatch_test        (const DBusString             *test_data_dir);
-dbus_bool_t bus_policy_test          (const DBusString             *test_data_dir);
-dbus_bool_t bus_config_parser_test   (const DBusString             *test_data_dir);
-dbus_bool_t bus_setup_debug_client   (DBusConnection               *connection);
-void        bus_test_clients_foreach (BusConnectionForeachFunction  function,
-                                      void                         *data);
-dbus_bool_t bus_test_client_listed   (DBusConnection               *connection);
-void        bus_test_flush_bus       (BusContext                   *context);
-
-BusContext* bus_context_new_test     (const DBusString             *test_data_dir,
-                                      const char                   *filename);
+dbus_bool_t bus_dispatch_test         (const DBusString             *test_data_dir);
+dbus_bool_t bus_policy_test           (const DBusString             *test_data_dir);
+dbus_bool_t bus_config_parser_test    (const DBusString             *test_data_dir);
+dbus_bool_t bus_setup_debug_client    (DBusConnection               *connection);
+void        bus_test_clients_foreach  (BusConnectionForeachFunction  function,
+                                       void                         *data);
+dbus_bool_t bus_test_client_listed    (DBusConnection               *connection);
+void        bus_test_run_bus_loop     (BusContext                   *context);
+void        bus_test_run_clients_loop (void);
+void        bus_test_run_everything   (BusContext                   *context);
+BusContext* bus_context_new_test      (const DBusString             *test_data_dir,
+                                       const char                   *filename);
+
 
 #endif