From 64f3d8f67db09e0c84ed3ff009b86d0127fe82b4 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 24 Apr 2005 14:04:16 +0000 Subject: 2005-04-23 Havoc Pennington * dbus/dbus-message.c (dbus_message_append_args): fix doc comment, reported by Tony Houghton * test/test-service.c (main): test dbus_connection_get_object_path_data() * dbus/dbus-object-tree.c (find_handler): be sure we always init the exact_match (_dbus_object_tree_get_user_data_unlocked): new function used by dbus_connection_get_object_path_data() (do_register): add assertion test for get_user_data_unlocked (object_tree_test_iteration): more tests * dbus/dbus-connection.c (dbus_connection_get_object_path_data): new function from Dan Reed to let you get the user data from dbus_connection_register_object_path() --- dbus/dbus-object-tree.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'dbus/dbus-object-tree.h') diff --git a/dbus/dbus-object-tree.h b/dbus/dbus-object-tree.h index 6d8484e0..d1c04b4b 100644 --- a/dbus/dbus-object-tree.h +++ b/dbus/dbus-object-tree.h @@ -33,16 +33,19 @@ DBusObjectTree* _dbus_object_tree_new (DBusConnection *connection); DBusObjectTree* _dbus_object_tree_ref (DBusObjectTree *tree); void _dbus_object_tree_unref (DBusObjectTree *tree); -dbus_bool_t _dbus_object_tree_register (DBusObjectTree *tree, - dbus_bool_t fallback, - const char **path, - const DBusObjectPathVTable *vtable, - void *user_data); -void _dbus_object_tree_unregister_and_unlock (DBusObjectTree *tree, - const char **path); -DBusHandlerResult _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree, - DBusMessage *message); -void _dbus_object_tree_free_all_unlocked (DBusObjectTree *tree); +dbus_bool_t _dbus_object_tree_register (DBusObjectTree *tree, + dbus_bool_t fallback, + const char **path, + const DBusObjectPathVTable *vtable, + void *user_data); +void _dbus_object_tree_unregister_and_unlock (DBusObjectTree *tree, + const char **path); +DBusHandlerResult _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree, + DBusMessage *message); +void* _dbus_object_tree_get_user_data_unlocked (DBusObjectTree *tree, + const char **path); +void _dbus_object_tree_free_all_unlocked (DBusObjectTree *tree); + dbus_bool_t _dbus_object_tree_list_registered_and_unlock (DBusObjectTree *tree, const char **parent_path, -- cgit