enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

elm: fix compliation warnings in dbus menu & toolbar 

These warnings were serious problems.
Thanks to stefan for reporting.
This commit is contained in:
Amitesh Singh 2016-11-30 18:33:59 +05:30
parent 67d228230a
commit 1f3f66b662
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/elementary/elm_dbus_menu.c
View File

@ -333,9 +333,8 @@ _root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list,
{ {
char *property; char *property;
Eldbus_Message_Iter *layout, *array, *pair, *variant; Eldbus_Message_Iter *layout, *array, *pair, *variant;
const Eina_List *ret = NULL;
Eina_List *items;
Eina_List *l; Eina_List *l;
Eina_Iterator *it = NULL;
Elm_Object_Item *obj_item; Elm_Object_Item *obj_item;
layout = eldbus_message_iter_container_new(iter, 'r', NULL); 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) if (recursion_depth > 0)
{ {
ret = efl_ui_menu_items_get(dbus_menu->menu); it = efl_ui_menu_items_get(dbus_menu->menu);
items = (Eina_List *)ret; EINA_ITERATOR_FOREACH (it, obj_item)
EINA_LIST_FOREACH (items, l, obj_item)
{ {
variant = eldbus_message_iter_container_new(array, 'v', variant = eldbus_message_iter_container_new(array, 'v',
"(ia{sv}av)"); "(ia{sv}av)");
@ -372,6 +370,7 @@ _root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list,
recursion_depth - 1, variant); recursion_depth - 1, variant);
eldbus_message_iter_container_close(array, variant); eldbus_message_iter_container_close(array, variant);
} }
eina_iterator_free(it);
} }
eldbus_message_iter_container_close(layout, array); eldbus_message_iter_container_close(layout, array);

2
src/lib/elementary/elm_toolbar.c
View File

@ -3254,7 +3254,7 @@ _elm_toolbar_efl_ui_menu_last_item_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd
EOLIAN static Eina_Iterator* EOLIAN static Eina_Iterator*
_elm_toolbar_efl_ui_menu_items_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) _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 * EOLIAN static Elm_Object_Item *