summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-object-tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'dbus/dbus-object-tree.c')
-rw-r--r--dbus/dbus-object-tree.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 3ec97320..4f82d6f5 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -536,13 +536,12 @@ free_subtree_recurse (DBusConnection *connection,
/* Call application code */
if (subtree->unregister_function)
- {
- (* subtree->unregister_function) (connection,
- subtree->user_data);
- subtree->message_function = NULL;
- subtree->unregister_function = NULL;
- subtree->user_data = NULL;
- }
+ (* subtree->unregister_function) (connection,
+ subtree->user_data);
+
+ subtree->message_function = NULL;
+ subtree->unregister_function = NULL;
+ subtree->user_data = NULL;
/* Now free ourselves */
_dbus_object_subtree_unref (subtree);