From e00ed20805c136fe63d0f7abc7602f1c9fe2b7bb Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 11 Jun 2010 15:23:46 +0100
Subject: [PATCH] click-action: Use clutter_actor_contains()
Instead of an internal copy.
---
clutter/clutter-click-action.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/clutter/clutter-click-action.c b/clutter/clutter-click-action.c
index 413268552..222e3baed 100644
--- a/clutter/clutter-click-action.c
+++ b/clutter/clutter-click-action.c
@@ -101,16 +101,6 @@ click_action_set_pressed (ClutterClickAction *action,
g_object_notify (G_OBJECT (action), "pressed");
}
-static gboolean
-actor_contains_source (ClutterActor *actor,
- ClutterActor *event_source)
-{
- while (event_source != NULL && event_source != actor)
- event_source = clutter_actor_get_parent (event_source);
-
- return event_source != NULL;
-}
-
static gboolean
on_event (ClutterActor *actor,
ClutterEvent *event,
@@ -131,7 +121,7 @@ on_event (ClutterActor *actor,
if (priv->is_held)
return TRUE;
- if (!actor_contains_source (actor, clutter_event_get_source (event)))
+ if (!clutter_actor_contains (actor, clutter_event_get_source (event)))
return FALSE;
priv->is_held = TRUE;
@@ -153,7 +143,7 @@ on_event (ClutterActor *actor,
priv->is_held = FALSE;
clutter_ungrab_pointer ();
- if (!actor_contains_source (actor, clutter_event_get_source (event)))
+ if (!clutter_actor_contains (actor, clutter_event_get_source (event)))
return FALSE;
click_action_set_pressed (action, FALSE);