Sync to upstream change

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 8234e39..47194dd 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -387,7 +387,6 @@ _sizing_eval(Evas_Object *obj)
    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
    if (w < minw) w = minw;
    if (h < minh) h = minh;
-
    evas_object_resize(wd->scr, w, h);
 
    evas_object_size_hint_min_get(wd->bx, &minw, &minh);
@@ -1314,9 +1313,10 @@ elm_toolbar_item_icon_set(Elm_Toolbar_Item *item, const char *icon)
 {
    Evas_Object *icon_obj;
    Widget_Data *wd;
-   Evas_Object *obj = item->base.widget;
+   Evas_Object *obj;
 
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
+   obj = WIDGET(item);
    wd = elm_widget_data_get(obj);
    if (!wd) return;
    if ((icon) && (item->icon_str) && (!strcmp(icon, item->icon_str))) return;
@@ -1339,10 +1339,11 @@ elm_toolbar_item_icon_memfile_set(Elm_Toolbar_Item *item, const void *img, size_
 {
    Evas_Object *icon_obj;
    Widget_Data *wd;
-   Evas_Object *obj = item->base.widget;
+   Evas_Object *obj;
    Eina_Bool ret;
 
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
+   obj = WIDGET(item);
    wd = elm_widget_data_get(obj);
    if (!wd) return EINA_FALSE;
 
@@ -1368,9 +1369,10 @@ EAPI Evas_Object *
 elm_toolbar_item_icon_object_get(Elm_Toolbar_Item *item)
 {
    Widget_Data *wd;
-   Evas_Object *obj = item->base.widget;
+   Evas_Object *obj;
 
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
+   obj = WIDGET(item);
    wd = elm_widget_data_get(obj);
    if (!wd) return NULL;