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

	* dbus/dbus-connection.c (dbus_connection_flush): don't spin on
	the connection if it's disconnected

	* bus/activation.c (bus_activation_service_created): use new
	transaction features to roll back removal of pending activation if
	we don't successfully create the service after all. Don't remove
	pending activation if the function fails.

	* dbus/dbus-list.c (_dbus_list_insert_before_link)
	(_dbus_list_insert_after_link): new code to facilitate
	services.c fixes

	* dbus/dbus-hash.c (_dbus_hash_table_insert_string_preallocated):
	new functionality, so we can preallocate the ability to insert
	into a hash table.

	* bus/connection.c (bus_transaction_add_cancel_hook): new function
	allowing us to put custom hooks in a transaction to be used for
	cancelling said transaction

	* doc/dbus-specification.sgml: add some discussion of secondary
	service owners, and disallow zero-length service names

	* bus/services.c (bus_registry_acquire_service): new function,
	splits out part of bus_driver_handle_acquire_service() and fixes
	a bug where we didn't remove the service doing the acquiring
	from the secondary queue if we failed to remove the current owner
	from the front of the queue.

1 files changed, 41 insertions, 35 deletions

diff --git a/dbus/dbus-list.h b/dbus/dbus-list.h
index 5f42ca3c..ad74dfd0 100644
--- a/dbus/dbus-list.h
+++ b/dbus/dbus-list.h
@@ -38,44 +38,50 @@ struct DBusList
   DBusList *next; /**< Next list node. */
   void     *data; /**< Data stored at this element. */
 };
+dbus_bool_t _dbus_list_append             (DBusList **list,
+                                           void      *data);
+dbus_bool_t _dbus_list_prepend            (DBusList **list,
+                                           void      *data);
+dbus_bool_t _dbus_list_insert_before      (DBusList **list,
+                                           DBusList  *before_this_link,
+                                           void      *data);
+dbus_bool_t _dbus_list_insert_after       (DBusList **list,
+                                           DBusList  *after_this_link,
+                                           void      *data);
+void        _dbus_list_insert_before_link (DBusList **list,
+                                           DBusList  *before_this_link,
+                                           DBusList  *link);
+void        _dbus_list_insert_after_link  (DBusList **list,
+                                           DBusList  *after_this_link,
+                                           DBusList  *link);
+dbus_bool_t _dbus_list_remove             (DBusList **list,
+                                           void      *data);
+dbus_bool_t _dbus_list_remove_last        (DBusList **list,
+                                           void      *data);
+void        _dbus_list_remove_link        (DBusList **list,
+                                           DBusList  *link);
+void        _dbus_list_clear              (DBusList **list);
+DBusList*   _dbus_list_get_first_link     (DBusList **list);
+DBusList*   _dbus_list_get_last_link      (DBusList **list);
+void*       _dbus_list_get_last           (DBusList **list);
+void*       _dbus_list_get_first          (DBusList **list);
+void*       _dbus_list_pop_first          (DBusList **list);
+void*       _dbus_list_pop_last           (DBusList **list);
+DBusList*   _dbus_list_pop_first_link     (DBusList **list);
+DBusList*   _dbus_list_pop_last_link      (DBusList **list);
+dbus_bool_t _dbus_list_copy               (DBusList **list,
+                                           DBusList **dest);
+int         _dbus_list_get_length         (DBusList **list);
+DBusList*   _dbus_list_alloc_link         (void      *data);
+void        _dbus_list_free_link          (DBusList  *link);
+void        _dbus_list_append_link        (DBusList **list,
+                                           DBusList  *link);
+void        _dbus_list_prepend_link       (DBusList **list,
+                                           DBusList  *link);
+dbus_bool_t _dbus_list_length_is_one      (DBusList **list);
 
-dbus_bool_t _dbus_list_append         (DBusList **list,
-                                       void      *data);
-dbus_bool_t _dbus_list_prepend        (DBusList **list,
-                                       void      *data);
-dbus_bool_t _dbus_list_insert_before  (DBusList **list,
-                                       DBusList  *before_this_link,
-                                       void      *data);
-dbus_bool_t _dbus_list_insert_after   (DBusList **list,
-                                       DBusList  *after_this_link,
-                                       void      *data);
-dbus_bool_t _dbus_list_remove         (DBusList **list,
-                                       void      *data);
-dbus_bool_t _dbus_list_remove_last    (DBusList **list,
-                                       void      *data);
-void        _dbus_list_remove_link    (DBusList **list,
-                                       DBusList  *link);
-void        _dbus_list_clear          (DBusList **list);
-DBusList*   _dbus_list_get_first_link (DBusList **list);
-DBusList*   _dbus_list_get_last_link  (DBusList **list);
-void*       _dbus_list_get_last       (DBusList **list);
-void*       _dbus_list_get_first      (DBusList **list);
-void*       _dbus_list_pop_first      (DBusList **list);
-void*       _dbus_list_pop_last       (DBusList **list);
-DBusList*   _dbus_list_pop_first_link (DBusList **list);
-DBusList*   _dbus_list_pop_last_link  (DBusList **list);
-dbus_bool_t _dbus_list_copy           (DBusList **list,
-                                       DBusList **dest);
-int         _dbus_list_get_length     (DBusList **list);
 
-DBusList*   _dbus_list_alloc_link     (void      *data);
-void        _dbus_list_free_link      (DBusList  *link);
-void        _dbus_list_append_link    (DBusList **list,
-				       DBusList  *link);
-void        _dbus_list_prepend_link   (DBusList **list,
-				       DBusList  *link);
 
-dbus_bool_t _dbus_list_length_is_one  (DBusList **list);
 
 void _dbus_list_foreach (DBusList            **list,
                          DBusForeachFunction   function,