From c8aadcd4fb7f6befb7b6bb751cda5e719bd09d80 Mon Sep 17 00:00:00 2001 From: yoz Date: Wed, 15 Jun 2011 14:07:28 +0000 Subject: [PATCH] elementary: fix tooltip segfaults with gengrid (cedric thanks) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@60347 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/els_tooltip.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c index 060f06f..b7341f1 100644 --- a/src/lib/els_tooltip.c +++ b/src/lib/els_tooltip.c @@ -424,7 +424,7 @@ _elm_tooltip_obj_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj _elm_tooltip_hide_anim_start(tt); } -static void _elm_tooltip_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); +static void _elm_tooltip_obj_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); static void _elm_tooltip_unset(Elm_Tooltip *tt) @@ -442,14 +442,14 @@ _elm_tooltip_unset(Elm_Tooltip *tt) (tt->eventarea, EVAS_CALLBACK_MOUSE_OUT, _elm_tooltip_obj_mouse_out_cb, tt); evas_object_event_callback_del_full - (tt->eventarea, EVAS_CALLBACK_DEL, _elm_tooltip_obj_del_cb, tt); + (tt->eventarea, EVAS_CALLBACK_FREE, _elm_tooltip_obj_free_cb, tt); evas_object_data_del(tt->eventarea, _tooltip_key); } if (tt->owner) { evas_object_event_callback_del_full - (tt->owner, EVAS_CALLBACK_DEL, _elm_tooltip_obj_del_cb, tt); + (tt->owner, EVAS_CALLBACK_FREE, _elm_tooltip_obj_free_cb, tt); elm_widget_tooltip_del(tt->owner, tt); } @@ -458,7 +458,7 @@ _elm_tooltip_unset(Elm_Tooltip *tt) } static void -_elm_tooltip_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_elm_tooltip_obj_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Elm_Tooltip *tt = data; if (tt->eventarea == obj) tt->eventarea = NULL; @@ -561,13 +561,13 @@ elm_object_sub_tooltip_content_cb_set(Evas_Object *eventarea, Evas_Object *owner { if (tt->owner != eventarea) evas_object_event_callback_del_full - (tt->owner, EVAS_CALLBACK_DEL, _elm_tooltip_obj_del_cb, tt); + (tt->owner, EVAS_CALLBACK_FREE, _elm_tooltip_obj_free_cb, tt); elm_widget_tooltip_del(tt->owner, tt); if (owner != eventarea) evas_object_event_callback_add - (owner, EVAS_CALLBACK_DEL, _elm_tooltip_obj_del_cb, tt); + (owner, EVAS_CALLBACK_FREE, _elm_tooltip_obj_free_cb, tt); elm_widget_tooltip_add(tt->owner, tt); } @@ -597,11 +597,11 @@ elm_object_sub_tooltip_content_cb_set(Evas_Object *eventarea, Evas_Object *owner (eventarea, EVAS_CALLBACK_MOUSE_OUT, _elm_tooltip_obj_mouse_out_cb, tt); evas_object_event_callback_add - (eventarea, EVAS_CALLBACK_DEL, _elm_tooltip_obj_del_cb, tt); + (eventarea, EVAS_CALLBACK_FREE, _elm_tooltip_obj_free_cb, tt); if (owner != eventarea) evas_object_event_callback_add - (owner, EVAS_CALLBACK_DEL, _elm_tooltip_obj_del_cb, tt); + (owner, EVAS_CALLBACK_FREE, _elm_tooltip_obj_free_cb, tt); elm_widget_tooltip_add(tt->owner, tt); } -- 2.7.4