isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

box-layout: Plug memory leaks

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=660985
This commit is contained in:
Sunjin Yang 2011-10-07 15:21:34 +09:00 committed by Emmanuele Bassi
parent c607382de6
commit 5dbc00e625
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clutter/clutter-box-layout.c
View File

@ -749,16 +749,15 @@ count_expand_children (ClutterLayoutManager *layout,
gint *visible_children, gint *visible_children,
gint *expand_children) gint *expand_children)
{ {
GList *children; GList *children, *l;
ClutterActor *child; ClutterActor *child;
*visible_children = *expand_children = 0; *visible_children = *expand_children = 0;
for (children = clutter_container_get_children (container); children = clutter_container_get_children (container);
children; for (l = children; l != NULL; l = l->next)
children = children->next)
{ {
child = children->data; child = l->data;
if (CLUTTER_ACTOR_IS_VISIBLE (child)) if (CLUTTER_ACTOR_IS_VISIBLE (child))
{ {
@ -901,7 +900,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
{ {
ClutterBoxLayoutPrivate *priv = CLUTTER_BOX_LAYOUT (layout)->priv; ClutterBoxLayoutPrivate *priv = CLUTTER_BOX_LAYOUT (layout)->priv;
ClutterActor *child; ClutterActor *child;
GList *children; GList *children, *l;
gint nvis_children; gint nvis_children;
gint nexpand_children; gint nexpand_children;
gboolean is_rtl; gboolean is_rtl;
@ -929,11 +928,10 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
size = box->x2 - box->x1 - (nvis_children - 1) * priv->spacing; size = box->x2 - box->x1 - (nvis_children - 1) * priv->spacing;
/* Retrieve desired size for visible children. */ /* Retrieve desired size for visible children. */
for (i = 0, children = clutter_container_get_children (container); children = clutter_container_get_children (container);
children; for (i = 0, l = children; l != NULL; l = l->next)
children = children->next)
{ {
child = children->data; child = l->data;
if (!CLUTTER_ACTOR_IS_VISIBLE (child)) if (!CLUTTER_ACTOR_IS_VISIBLE (child))
continue; continue;
@ -1037,14 +1035,14 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
} }
children = clutter_container_get_children (container); children = clutter_container_get_children (container);
for (i = g_list_length (children) - 1, children = g_list_last (children); for (i = g_list_length (children) - 1, l = g_list_last (children);
children; l != NULL;
children = children->prev, i--) l = l->prev, i--)
{ {
ClutterLayoutMeta *meta; ClutterLayoutMeta *meta;
ClutterBoxChild *box_child; ClutterBoxChild *box_child;
child = children->data; child = l->data;
meta = clutter_layout_manager_get_child_meta (layout, meta = clutter_layout_manager_get_child_meta (layout,
container, container,
child); child);