From 4eb46eb3d4afaaee3106c675b3e1f16b12b44abc Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Wed, 7 Aug 2024 11:21:07 +0200
Subject: [PATCH] clutter/actor: Remove has_accessible

Instead, the users of the API can check if get_accessible returns NULL
which is more correct and avoids the extra vfunc that is not even used

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3917>
---
 clutter/clutter/clutter-actor-accessible.c |  5 ++---
 clutter/clutter/clutter-actor.c            | 11 -----------
 clutter/clutter/clutter-actor.h            |  3 ---
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/clutter/clutter/clutter-actor-accessible.c b/clutter/clutter/clutter-actor-accessible.c
index f35671bfa..e2bb30513 100644
--- a/clutter/clutter/clutter-actor-accessible.c
+++ b/clutter/clutter/clutter-actor-accessible.c
@@ -134,11 +134,10 @@ clutter_actor_accessible_remove_actor (ClutterActor *container,
   g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), 0);
 
   atk_parent = clutter_actor_get_accessible (container);
+  atk_child = clutter_actor_get_accessible (actor);
 
-  if (clutter_actor_has_accessible (actor))
+  if (atk_child)
     {
-      atk_child = clutter_actor_get_accessible (actor);
-
       g_assert (ATK_IS_OBJECT (atk_child));
       g_object_ref (atk_child);
 
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 24d6090c0..c82409cea 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -18468,17 +18468,6 @@ clutter_actor_create_texture_paint_node (ClutterActor *self,
   return node;
 }
 
-gboolean
-clutter_actor_has_accessible (ClutterActor *actor)
-{
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), FALSE);
-
-  if (CLUTTER_ACTOR_GET_CLASS (actor)->has_accessible)
-    return CLUTTER_ACTOR_GET_CLASS (actor)->has_accessible (actor);
-
-  return actor->priv->accessible != NULL;
-}
-
 /**
  * clutter_actor_set_accessible:
  * @self: A #ClutterActor
diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
index d03355709..2bc67724e 100644
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -231,7 +231,6 @@ struct _ClutterActorClass
 
   gboolean (* touch_event)          (ClutterActor         *self,
                                      ClutterEvent         *event);
-  gboolean (* has_accessible)       (ClutterActor         *self);
   void     (* resource_scale_changed) (ClutterActor *self);
   float    (* calculate_resource_scale) (ClutterActor *self,
                                          int           phase);
@@ -322,8 +321,6 @@ const gchar *                   clutter_actor_get_accessible_name
 CLUTTER_EXPORT
 AtkObject *                     clutter_actor_get_accessible                    (ClutterActor                *self);
 CLUTTER_EXPORT
-gboolean                        clutter_actor_has_accessible                    (ClutterActor                *self);
-CLUTTER_EXPORT
 void                            clutter_actor_set_accessible                    (ClutterActor                *self,
                                                                                  AtkObject                   *accessible);
 CLUTTER_EXPORT