From 8d47f79b2c56080763a2e4478ededc364996178d Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 16 Oct 2020 10:06:39 -0300
Subject: [PATCH] clutter/actor: Remove '_paint' suffix from
 clutter_actor_should_pick_paint

We're not using paint to pick anymore.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1509
---
 clutter/clutter/clutter-actor.c     | 13 ++++++-------
 clutter/clutter/clutter-actor.h     |  2 +-
 src/compositor/meta-surface-actor.c |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index c94dab8a2..4a92d6ffd 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -2311,7 +2311,7 @@ static void
 clutter_actor_real_pick (ClutterActor       *self,
                          ClutterPickContext *pick_context)
 {
-  if (clutter_actor_should_pick_paint (self, pick_context))
+  if (clutter_actor_should_pick (self, pick_context))
     {
       ClutterActorBox box = {
         .x1 = 0,
@@ -2342,22 +2342,21 @@ clutter_actor_real_pick (ClutterActor       *self,
 }
 
 /**
- * clutter_actor_should_pick_paint:
+ * clutter_actor_should_pick:
  * @self: A #ClutterActor
  * @pick_context: a #ClutterPickContext
  *
  * Should be called inside the implementation of the
  * #ClutterActor::pick virtual function in order to check whether
- * the actor should paint itself in pick mode or not.
+ * the actor should be picked or not.
  *
  * This function should never be called directly by applications.
  *
- * Return value: %TRUE if the actor should paint its silhouette,
- *   %FALSE otherwise
+ * Return value: %TRUE if the actor should be picked, %FALSE otherwise
  */
 gboolean
-clutter_actor_should_pick_paint (ClutterActor       *self,
-                                 ClutterPickContext *pick_context)
+clutter_actor_should_pick (ClutterActor       *self,
+                           ClutterPickContext *pick_context)
 {
   g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
 
diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
index 8bb7bd174..bc858fb5a 100644
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -591,7 +591,7 @@ void                            clutter_actor_set_offscreen_redirect
 CLUTTER_EXPORT
 ClutterOffscreenRedirect        clutter_actor_get_offscreen_redirect            (ClutterActor               *self);
 CLUTTER_EXPORT
-gboolean                        clutter_actor_should_pick_paint                 (ClutterActor               *self,
+gboolean                        clutter_actor_should_pick                       (ClutterActor               *self,
                                                                                  ClutterPickContext         *pick_context);
 CLUTTER_EXPORT
 gboolean                        clutter_actor_is_in_clone_paint                 (ClutterActor               *self);
diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c
index 89cd7b014..97202b8eb 100644
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -184,7 +184,7 @@ meta_surface_actor_pick (ClutterActor       *actor,
   ClutterActorIter iter;
   ClutterActor *child;
 
-  if (!clutter_actor_should_pick_paint (actor, pick_context))
+  if (!clutter_actor_should_pick (actor, pick_context))
     return;
 
   /* If there is no region then use the regular pick */