2003-03-16 Anders Carlsson <andersca@codefactory.se>

	* bus/activation.c: (bus_pending_activation_entry_free),
	(bus_pending_activation_free), (bus_activation_new),
	(bus_activation_unref), (bus_activation_service_created),
	(bus_activation_activate_service):
	* bus/activation.h:
	* bus/bus.c: (bus_context_new):
	* bus/desktop-file.c: (new_section):
	* bus/driver.c: (bus_driver_send_service_deleted),
	(bus_driver_handle_activate_service):
	* bus/services.c: (bus_registry_new), (bus_registry_ensure):
	* bus/services.h:
	* dbus/dbus-connection.c:
	(dbus_connection_send_with_reply_and_block):
	* dbus/dbus-message.c: (dbus_message_append_args_valist):
	* dbus/dbus-protocol.h:
	Make activation work better. Now pending activations will be queued
	and the daemon won't try to activate services that are already registered.

1 files changed, 2 insertions, 2 deletions

diff --git a/bus/bus.c b/bus/bus.c
index 4319e5fe..589dda1b 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -141,7 +141,7 @@ bus_context_new (const char  *address,
       goto failed;
     }
 
-  context->activation = bus_activation_new (address, service_dirs,
+  context->activation = bus_activation_new (context, address, service_dirs,
                                             error);
   if (context->activation == NULL)
     {
@@ -156,7 +156,7 @@ bus_context_new (const char  *address,
       goto failed;
     }
 
-  context->registry = bus_registry_new ();
+  context->registry = bus_registry_new (context);
   if (context->registry == NULL)
     {
       BUS_SET_OOM (error);