diff options
| author | Amitesh Singh <amitesh.sh@samsung.com> | 2016-11-30 18:33:59 +0530 |
|---|---|---|
| committer | Amitesh Singh <amitesh.sh@samsung.com> | 2016-11-30 18:33:59 +0530 |
| commit | 1f3f66b662a88ca38458a64200d9586830525389 (patch) | |
| tree | e03d5c5811d1d5d8396a48723d74c9f845d90c55 | |
| parent | 67d228230a2f20ec78b4aa66a22a4827fe1931fb (diff) | |
| download | efl-1f3f66b662a88ca38458a64200d9586830525389.tar.gz | |
elm: fix compliation warnings in dbus menu & toolbar
These warnings were serious problems.
Thanks to stefan for reporting.
| -rw-r--r-- | src/lib/elementary/elm_dbus_menu.c | 9 | ||||
| -rw-r--r-- | src/lib/elementary/elm_toolbar.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/elementary/elm_dbus_menu.c b/src/lib/elementary/elm_dbus_menu.c index d649a2443b..9610a0b273 100644 --- a/src/lib/elementary/elm_dbus_menu.c +++ b/src/lib/elementary/elm_dbus_menu.c @@ -333,9 +333,8 @@ _root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list, { char *property; Eldbus_Message_Iter *layout, *array, *pair, *variant; - const Eina_List *ret = NULL; - Eina_List *items; Eina_List *l; + Eina_Iterator *it = NULL; Elm_Object_Item *obj_item; layout = eldbus_message_iter_container_new(iter, 'r', NULL); @@ -361,9 +360,8 @@ _root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list, if (recursion_depth > 0) { - ret = efl_ui_menu_items_get(dbus_menu->menu); - items = (Eina_List *)ret; - EINA_LIST_FOREACH (items, l, obj_item) + it = efl_ui_menu_items_get(dbus_menu->menu); + EINA_ITERATOR_FOREACH (it, obj_item) { variant = eldbus_message_iter_container_new(array, 'v', "(ia{sv}av)"); @@ -372,6 +370,7 @@ _root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list, recursion_depth - 1, variant); eldbus_message_iter_container_close(array, variant); } + eina_iterator_free(it); } eldbus_message_iter_container_close(layout, array); diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 9052c290ec..f88998c79b 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -3254,7 +3254,7 @@ _elm_toolbar_efl_ui_menu_last_item_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd EOLIAN static Eina_Iterator* _elm_toolbar_efl_ui_menu_items_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) { - return eina_list_iterator_new(sd->items); + return eina_inlist_iterator_new(sd->items); } EOLIAN static Elm_Object_Item * |