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

1 files changed, 2 insertions, 3 deletions

diff --git a/bus/main.c b/bus/main.c
index d18d61ac..ef3f013c 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -21,7 +21,6 @@
  *
  */
 #include "bus.h"
-#include "loop.h"
 #include <dbus/dbus-internals.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +39,7 @@ signal_handler (int sig)
     case SIGHUP:
       got_sighup = TRUE;
     case SIGTERM:
-      bus_loop_quit (bus_context_get_loop (context));
+      _dbus_loop_quit (bus_context_get_loop (context));
       break;
     }
 }
@@ -230,7 +229,7 @@ main (int argc, char **argv)
   _dbus_set_signal_handler (SIGTERM, signal_handler);
   
   _dbus_verbose ("We are on D-Bus...\n");
-  bus_loop_run (bus_context_get_loop (context));
+  _dbus_loop_run (bus_context_get_loop (context));
   
   bus_context_shutdown (context);
   bus_context_unref (context);