From 4705a3d715f2f4f84861b78fbee9248837d8fc33 Mon Sep 17 00:00:00 2001 From: seoz Date: Wed, 24 Aug 2011 08:11:58 +0000 Subject: [PATCH] elm: Removed trailing whitespaces. Raster finished accessibility. So I fixed it too. git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@62737 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_access.c | 10 +++++----- src/lib/elm_check.c | 2 +- src/lib/elm_toolbar.c | 4 ++-- src/lib/elm_widget.c | 12 ++++++++++++ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c index 2964d97..f0257fa 100644 --- a/src/lib/elm_access.c +++ b/src/lib/elm_access.c @@ -177,7 +177,7 @@ _access_obj_hilight_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Obje { Evas_Coord x, y; Evas_Object *o; - + o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp"); if (!o) return; evas_object_geometry_get(obj, &x, &y, NULL, NULL); @@ -189,7 +189,7 @@ _access_obj_hilight_resize_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Ob { Evas_Coord w, h; Evas_Object *o; - + o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp"); if (!o) return; evas_object_geometry_get(obj, NULL, NULL, &w, &h); @@ -322,7 +322,7 @@ _elm_access_object_hilight(Evas_Object *obj) { Evas_Object *o; Evas_Coord x, y, w, h; - + o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp"); if (!o) { @@ -367,7 +367,7 @@ EAPI void _elm_access_object_unhilight(Evas_Object *obj) { Evas_Object *o, *ptarget; - + o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp"); if (!o) return; ptarget = evas_object_data_get(o, "_elm_access_target"); @@ -460,7 +460,7 @@ _access_item_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU { Elm_Access_Info *ac = ((Elm_Widget_Item *)data)->access; if (!ac) return; - + _elm_access_object_unhilight(((Elm_Widget_Item *)data)->view); if (ac->delay_timer) { diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index d25e5b3..79fa9c0 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -395,7 +395,7 @@ elm_check_add(Evas_Object *parent) // TODO: convert Elementary to subclassing of Evas_Smart_Class // TODO: and save some bytes, making descriptions per-class and not instance! evas_object_smart_callbacks_descriptions_set(obj, _signals); - + _elm_access_object_register(obj, wd->chk); _elm_access_text_set(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Check")); diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index c90974a..d2c6bc8 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -640,7 +640,7 @@ static void _select(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { Elm_Toolbar_Item *it = data; - + if ((_elm_config->access_mode == ELM_ACCESS_MODE_OFF) || (_elm_access_2nd_click_timeout(it->base.view))) { @@ -767,7 +767,7 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f ELM_ACCESS_INFO, _access_info_cb, it); _elm_access_callback_set(_elm_access_item_get((Elm_Widget_Item *)it), ELM_ACCESS_STATE, _access_state_cb, it); - + if (_item_icon_set(icon_obj, "toolbar/", icon)) { it->icon = icon_obj; diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index c44c734..74f4627 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -2699,6 +2699,18 @@ _elm_widget_item_del(Elm_Widget_Item *item) if (item->view) evas_object_del(item->view); + if (item->access) + { + _elm_access_clear(item->access); + free(item->access); + item->access = NULL; + } + if (item->access_info) + { + eina_stringshare_del(item->access_info); + item->access_info = NULL; + } + EINA_MAGIC_SET(item, EINA_MAGIC_NONE); free(item); } -- 2.7.4