[EGIT] [core/elementary] elementary-1.14 01/01: widget: more fix wrt item data.

[ChunEon Park]

hermet pushed a commit to branch elementary-1.14.

http://git.enlightenment.org/core/elementary.git/commit/?id=edf5f53994235054f3e9b1587d722cb83168f201

commit edf5f53994235054f3e9b1587d722cb83168f201
Author: ChunEon Park <her...@hermet.pe.kr>
Date:   Mon May 18 17:15:09 2015 +0900

    widget: more fix wrt item data.
    
    widget item data is no more used.
    use eo item data instead.
    
    @fix.
---
 src/lib/elm_widget.c | 6 +++---
 src/lib/elm_widget.h | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 396b1cb..4f70922 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -4218,7 +4218,7 @@ _eo_del_cb(void *data EINA_UNUSED, Eo *eo_item, const 
Eo_Event_Description *desc
    Elm_Widget_Item_Data *item = eo_data_scope_get(eo_item, 
ELM_WIDGET_ITEM_CLASS);
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE);
    if (item->del_func)
-      item->del_func((void *) WIDGET_ITEM_DATA_GET(item->eo_obj), 
item->widget, item->eo_obj);
+      item->del_func((void *) WIDGET_ITEM_DATA_GET(eo_item), item->widget, 
item->eo_obj);
    return EINA_TRUE;
 }
 
@@ -4358,11 +4358,11 @@ _elm_widget_item_del_pre(Eo *eo_item EINA_UNUSED, 
Elm_Widget_Item_Data *item EIN
  * @ingroup Widget
  */
 EOLIAN static void
-_elm_widget_item_pre_notify_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data 
*item)
+_elm_widget_item_pre_notify_del(Eo *eo_item, Elm_Widget_Item_Data *item)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
    if (!item->del_func) return;
-   item->del_func((void *)item->data, item->widget, item->eo_obj);
+   item->del_func((void *)WIDGET_ITEM_DATA_GET(eo_item), item->widget, 
item->eo_obj);
    item->del_func = NULL;
 }
 
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index a0189a8..d8c8ea9 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -606,8 +606,6 @@ struct _Elm_Widget_Item_Data
    Eo                            *eo_obj;
    /**< the base view object */
    Evas_Object                   *view;
-   /**< item specific data. used for del callback */
-   const void                    *data;
    /**< user delete callback function */
    Evas_Smart_Cb                  del_func;
    /**< widget delete callback function. don't expose this callback call */

--