[gnome-shell/wip/clutter-deprecation-fixes: 3/18] st-widget: Don't explicitly check for ClutterContainer inheritance



commit 265d8af1f664c6a48664833d445d962b69867909
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Feb 15 06:51:27 2012 -0500

    st-widget: Don't explicitly check for ClutterContainer inheritance
    
    Since all ClutterActors implement the ClutterContainer interface, there
    isn't a case where this check could fail.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=670034

 src/st/st-widget.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index eb90e2b..b8b61b0 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -1722,18 +1722,17 @@ st_describe_actor (ClutterActor *actor)
   if (name)
     g_string_append_printf (desc, " \"%s\"", name);
 
-  if (!append_actor_text (desc, actor) && CLUTTER_IS_CONTAINER (actor))
+  if (!append_actor_text (desc, actor))
     {
       GList *children, *l;
 
       /* Do a limited search of @actor's children looking for a label */
-      children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
+      children = clutter_actor_get_children (actor);
       for (l = children, i = 0; l && i < 20; l = l->next, i++)
         {
           if (append_actor_text (desc, l->data))
             break;
-          else if (CLUTTER_IS_CONTAINER (l->data))
-            children = g_list_concat (children, clutter_container_get_children (l->data));
+          children = g_list_concat (children, clutter_actor_get_children (l->data));
         }
       g_list_free (children);
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]