From b9b2695831154531b5ffdc5ee99adb5e5367e0ec Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 8 Jul 2022 13:26:18 -0500 Subject: Replace pairs of get_reference_from_iter/ref_accessible with _atspi_dbus_return_accessible_from_iter They are equivalent. --- atspi/atspi-misc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'atspi') diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c index 4c3451cb..5ffe19d7 100644 --- a/atspi/atspi-misc.c +++ b/atspi/atspi-misc.c @@ -428,6 +428,7 @@ add_accessible_from_iter (DBusMessageIter *iter) DBusMessageIter iter_struct, iter_array; const char *app_name, *path; AtspiAccessible *accessible; + AtspiAccessible *parent; const char *name, *description; dbus_uint32_t role; gboolean children_cached = FALSE; @@ -436,8 +437,7 @@ add_accessible_from_iter (DBusMessageIter *iter) dbus_message_iter_recurse (iter, &iter_struct); /* get accessible */ - get_reference_from_iter (&iter_struct, &app_name, &path); - accessible = ref_accessible (app_name, path); + accessible = _atspi_dbus_return_accessible_from_iter (&iter_struct); if (!accessible) return; @@ -445,10 +445,10 @@ add_accessible_from_iter (DBusMessageIter *iter) dbus_message_iter_next (&iter_struct); /* get parent */ - get_reference_from_iter (&iter_struct, &app_name, &path); + parent = _atspi_dbus_return_accessible_from_iter (&iter_struct); if (accessible->accessible_parent) g_object_unref (accessible->accessible_parent); - accessible->accessible_parent = ref_accessible (app_name, path); + accessible->accessible_parent = parent; if (dbus_message_iter_get_arg_type (&iter_struct) == 'i') { @@ -487,8 +487,7 @@ add_accessible_from_iter (DBusMessageIter *iter) while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { AtspiAccessible *child; - get_reference_from_iter (&iter_array, &app_name, &path); - child = ref_accessible (app_name, path); + child = _atspi_dbus_return_accessible_from_iter (&iter_array); g_ptr_array_remove (accessible->children, child); g_ptr_array_add (accessible->children, child); } -- cgit v1.2.1