2003-01-27 Anders Carlsson <andersca@codefactory.se>

	* bus/dispatch.c: (bus_dispatch_message_handler):
	Dispatch messages sent to services.

	* bus/driver.c: (bus_driver_send_service_deleted),
	(bus_driver_send_service_created), (bus_driver_send_service_lost),
	(bus_driver_send_service_acquired):
	Add helper functions for sending service related messages.

	(bus_driver_send_welcome_message):
	Send HELLO_REPLY instead of WELCOME.

	(bus_driver_handle_list_services):
	Send LIST_SERVICES_REPLY instead of SERVICES.

	(bus_driver_handle_own_service),
	(bus_driver_handle_service_exists):
	New message handlers.

	(bus_driver_handle_message):
	Invoke new message handlers.

	(bus_driver_remove_connection):
	Don't remove any services here since that's done automatically
	by bus_service_remove_owner now.

	* bus/driver.h:
	New function signatures.

	* bus/services.c: (bus_service_add_owner):
	Send ServiceAcquired message if we're the only primary owner.

	(bus_service_remove_owner):
	Send ServiceAcquired/ServiceLost messages.

	(bus_service_set_prohibit_replacement),
	(bus_service_get_prohibit_replacement):
	Functions for setting prohibit replacement.

	(bus_service_has_owner):
	New function that checks if a connection is in the owner queue of
	a certain service.

	* bus/services.h:
	Add new function signatures.

	* dbus/dbus-list.c: (_dbus_list_test):
	Add tests for _dbus_list_remove_last and traversing the list backwards.

	* dbus/dbus-list.h:
	Fix a typo in _dbus_list_get_prev_link, if we're at the first element we can't
	go any further, so return NULL then.

	* dbus/dbus-protocol.h:
	Add new messages, service flags and service replies.

1 files changed, 63 insertions, 11 deletions

diff --git a/bus/services.c b/bus/services.c
index 0be56e75..1c949559 100644
--- a/bus/services.c
+++ b/bus/services.c
@@ -2,6 +2,7 @@
 /* services.c  Service management
  *
  * Copyright (C) 2003  Red Hat, Inc.
+ * Copyright (C) 2003  CodeFactory AB
  *
  * Licensed under the Academic Free License version 1.2
  * 
@@ -20,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#include "driver.h"
 #include "services.h"
 #include "connection.h"
 #include <dbus/dbus-hash.h>
@@ -30,6 +32,8 @@ struct BusService
 {
   char *name;
   DBusList *owners;
+
+  unsigned int prohibit_replacement:1;
 };
 
 static DBusHashTable *service_hash = NULL;
@@ -98,17 +102,6 @@ bus_service_lookup (const DBusString *service_name,
   return service;
 }
 
-void
-bus_service_free (BusService *service)
-{
-  _dbus_assert (service->owners == NULL);
-
-  _dbus_hash_table_remove_string (service_hash, service->name);
-  
-  dbus_free (service->name);
-  _dbus_mem_pool_dealloc (service_pool, service);
-}
-
 dbus_bool_t
 bus_service_add_owner (BusService     *service,
                        DBusConnection *owner)
@@ -123,6 +116,10 @@ bus_service_add_owner (BusService     *service,
       return FALSE;
     }
 
+ /* Send service acquired message */
+  if (bus_service_get_primary_owner (service) == owner)
+    bus_driver_send_service_acquired (owner, service->name);
+  
   return TRUE;
 }
 
@@ -130,8 +127,29 @@ void
 bus_service_remove_owner (BusService     *service,
                           DBusConnection *owner)
 {
+  /* Send service lost message */
+  if (bus_service_get_primary_owner (service) == owner)
+    bus_driver_send_service_lost (owner, service->name);
+  
   _dbus_list_remove_last (&service->owners, owner);
   bus_connection_remove_owned_service (owner, service);
+
+  if (service->owners == NULL)
+    {
+      /* Delete service */
+      bus_driver_send_service_deleted (service->name);
+      
+      _dbus_hash_table_remove_string (service_hash, service->name);
+      
+      dbus_free (service->name);
+      _dbus_mem_pool_dealloc (service_pool, service);
+    }
+  else 
+    {
+      /* Send service acquired to the new owner */
+      bus_driver_send_service_acquired (bus_service_get_primary_owner (service),
+					service->name);
+    }
 }
 
 DBusConnection*
@@ -202,3 +220,37 @@ bus_services_list (int *array_len)
 
   return NULL;
 }
+
+void
+bus_service_set_prohibit_replacement (BusService  *service,
+				      dbus_bool_t  prohibit_replacement)
+{
+  _dbus_assert (service->owners == NULL);
+  
+  service->prohibit_replacement = prohibit_replacement != FALSE;
+}
+
+dbus_bool_t
+bus_service_get_prohibit_replacement (BusService *service)
+{
+  return service->prohibit_replacement;
+}
+
+dbus_bool_t
+bus_service_has_owner (BusService     *service,
+		       DBusConnection *owner)
+{
+  DBusList *link;
+
+  link = _dbus_list_get_first_link (&service->owners);
+  
+  while (link != NULL)
+    {
+      if (link->data == owner)
+	return TRUE;
+      
+      link = _dbus_list_get_next_link (&service->owners, link);
+    }
+
+  return FALSE;
+}