From df008ef97deacd5bb00ac335e5d8671798fa09dd Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 6 Apr 2003 23:53:27 +0000 Subject: 2003-04-06 Havoc Pennington * 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 --- bus/bus.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'bus/bus.c') diff --git a/bus/bus.c b/bus/bus.c index 09a0b5bb..ee40e539 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -22,7 +22,6 @@ */ #include "bus.h" -#include "loop.h" #include "activation.h" #include "connection.h" #include "services.h" @@ -38,7 +37,7 @@ struct BusContext int refcount; char *type; char *address; - BusLoop *loop; + DBusLoop *loop; DBusList *servers; BusConnections *connections; BusActivation *activation; @@ -138,9 +137,9 @@ add_server_watch (DBusWatch *watch, context = server_get_context (server); - return bus_loop_add_watch (context->loop, - watch, server_watch_callback, server, - NULL); + return _dbus_loop_add_watch (context->loop, + watch, server_watch_callback, server, + NULL); } static void @@ -152,8 +151,8 @@ remove_server_watch (DBusWatch *watch, context = server_get_context (server); - bus_loop_remove_watch (context->loop, - watch, server_watch_callback, server); + _dbus_loop_remove_watch (context->loop, + watch, server_watch_callback, server); } @@ -174,8 +173,8 @@ add_server_timeout (DBusTimeout *timeout, context = server_get_context (server); - return bus_loop_add_timeout (context->loop, - timeout, server_timeout_callback, server, NULL); + return _dbus_loop_add_timeout (context->loop, + timeout, server_timeout_callback, server, NULL); } static void @@ -187,8 +186,8 @@ remove_server_timeout (DBusTimeout *timeout, context = server_get_context (server); - bus_loop_remove_timeout (context->loop, - timeout, server_timeout_callback, server); + _dbus_loop_remove_timeout (context->loop, + timeout, server_timeout_callback, server); } static void @@ -396,7 +395,7 @@ bus_context_new (const DBusString *config_file, */ context->max_completed_connections = 1024; - context->loop = bus_loop_new (); + context->loop = _dbus_loop_new (); if (context->loop == NULL) { BUS_SET_OOM (error); @@ -755,7 +754,7 @@ bus_context_unref (BusContext *context) if (context->loop) { - bus_loop_unref (context->loop); + _dbus_loop_unref (context->loop); context->loop = NULL; } @@ -798,7 +797,7 @@ bus_context_get_activation (BusContext *context) return context->activation; } -BusLoop* +DBusLoop* bus_context_get_loop (BusContext *context) { return context->loop; -- cgit