From a142f0bd394877b3b62c97f30a63876777b18aa9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 4 Apr 2016 21:39:29 +0900 Subject: [PATCH] elm_layout: Attach object to iterator This is part of a new API, not a fix This was missing in 3c40ebb99887ba4c74c40e4509c49cc675877886 --- src/lib/elementary/elm_layout.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c index ab40c98b83..860269b91b 100644 --- a/src/lib/elementary/elm_layout.c +++ b/src/lib/elementary/elm_layout.c @@ -1180,7 +1180,7 @@ _sub_iterator_free(Elm_Layout_Sub_Iterator *it) } static Eina_Iterator * -_sub_iterator_create(Elm_Layout_Smart_Data *sd, Eina_Bool objects) +_sub_iterator_create(Eo *eo_obj, Elm_Layout_Smart_Data *sd, Eina_Bool objects) { Elm_Layout_Sub_Iterator *it; @@ -1198,20 +1198,21 @@ _sub_iterator_create(Elm_Layout_Smart_Data *sd, Eina_Bool objects) it->iterator.next = FUNC_ITERATOR_NEXT(_objects_iterator_next); else it->iterator.next = FUNC_ITERATOR_NEXT(_names_iterator_next); + it->object = eo_obj; return &it->iterator; } EOLIAN static Eina_Iterator * -_elm_layout_elm_container_content_names_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd) +_elm_layout_elm_container_content_names_iterate(Eo *eo_obj, Elm_Layout_Smart_Data *sd) { - return _sub_iterator_create(sd, EINA_FALSE); + return _sub_iterator_create(eo_obj, sd, EINA_FALSE); } EOLIAN static Eina_Iterator * -_elm_layout_elm_container_content_objects_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd) +_elm_layout_elm_container_content_objects_iterate(Eo *eo_obj, Elm_Layout_Smart_Data *sd) { - return _sub_iterator_create(sd, EINA_TRUE); + return _sub_iterator_create(eo_obj, sd, EINA_TRUE); } EOLIAN static Eina_Bool