summaryrefslogtreecommitdiff
path: root/src/lib/elm_toolbar.c
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-09-17 16:44:05 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-11-12 12:03:58 +0200
commit4c0eba6cac277617476822912dc6675c95eae79c (patch)
treeb622207aa5909d21d8e10579edcaec1d61c9aa2f /src/lib/elm_toolbar.c
parenteb3896cfde8f2f47c0b3ebeb1f323c3d3c114575 (diff)
Object Items: replace most of del_pre functions with destructor.
This change is not simple because Elementary has not been built from the first day to work with Eo. Code had to be adapted to fit the new design. The del_pre that have not been replaced yet can return FALSE and prevent deletion. For these classes, code modification has to be deeper and will be done later.
Diffstat (limited to 'src/lib/elm_toolbar.c')
-rw-r--r--src/lib/elm_toolbar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 2a019fc2b..2bfdeb381 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2219,8 +2219,8 @@ _access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
2219 return NULL; 2219 return NULL;
2220} 2220}
2221 2221
2222EOLIAN static Eina_Bool 2222EOLIAN static void
2223_elm_toolbar_item_elm_widget_item_del_pre(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) 2223_elm_toolbar_item_eo_base_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item)
2224{ 2224{
2225 Elm_Toolbar_Item_Data *next = NULL; 2225 Elm_Toolbar_Item_Data *next = NULL;
2226 Evas_Object *obj; 2226 Evas_Object *obj;
@@ -2248,7 +2248,7 @@ _elm_toolbar_item_elm_widget_item_del_pre(Eo *eo_item EINA_UNUSED, Elm_Toolbar_I
2248 if (item != sd->more_item) 2248 if (item != sd->more_item)
2249 eo_do(obj, elm_obj_widget_theme_apply()); 2249 eo_do(obj, elm_obj_widget_theme_apply());
2250 2250
2251 return EINA_TRUE; 2251 eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, eo_destructor());
2252} 2252}
2253 2253
2254static void 2254static void