diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2017-10-26 11:11:12 -0700 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2017-10-26 11:11:12 -0700 |
commit | e4066474da6c97271e3cd33172cce40f52056e9b (patch) | |
tree | b26e02685ef5c4617a75857e634d10e36c52c1a0 /src/lib/elementary | |
parent | f75eb62c556d514c69fe66b4969cca64b9d35473 (diff) |
elementary: efl_ui_format_cb_set is actually going to free the existing format.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r-- | src/lib/elementary/efl_ui_slider.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 1020747318..a1c8fa9fd4 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c | |||
@@ -1174,7 +1174,6 @@ _efl_ui_slider_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Slider_Data *sd) | |||
1174 | evas_object_del(sd->popup); | 1174 | evas_object_del(sd->popup); |
1175 | evas_object_del(sd->popup2); | 1175 | evas_object_del(sd->popup2); |
1176 | 1176 | ||
1177 | if (sd->format_free_cb) sd->format_free_cb(sd->format_cb_data); | ||
1178 | efl_ui_format_cb_set(obj, NULL, NULL, NULL); | 1177 | efl_ui_format_cb_set(obj, NULL, NULL, NULL); |
1179 | eina_strbuf_free(sd->format_strbuf); | 1178 | eina_strbuf_free(sd->format_strbuf); |
1180 | 1179 | ||
@@ -1407,7 +1406,7 @@ EOLIAN static void | |||
1407 | _efl_ui_slider_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Slider_Data *sd, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb) | 1406 | _efl_ui_slider_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Slider_Data *sd, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb) |
1408 | { | 1407 | { |
1409 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); | 1408 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); |
1410 | 1409 | ||
1411 | if (sd->format_cb_data == func_data && sd->format_cb == func) | 1410 | if (sd->format_cb_data == func_data && sd->format_cb == func) |
1412 | return; | 1411 | return; |
1413 | 1412 | ||