From: Kamil Konieczny Date: Fri, 12 Jun 2020 13:18:54 +0000 (+0200) Subject: efl_ui_win_socket: fix socket_proxy release X-Git-Tag: submit/tizen/20200616.213914~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F236078%2F3;p=platform%2Fupstream%2Fefl.git efl_ui_win_socket: fix socket_proxy release socket_proxy was created with efl_add method, so use efl_del instead of efl_unref for object release. Change-Id: I81a470f1acc8d803aa1146dd0d6b8a1663c797ec --- diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index ac2b524..8980d3f 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4630,7 +4630,7 @@ _elm_win_atspi(Eina_Bool is_atspi) { if (!is_atspi) { - _access_socket_proxy_unref(obj); + _access_socket_proxy_del(obj); } else { diff --git a/src/lib/elementary/efl_ui_win_socket.c b/src/lib/elementary/efl_ui_win_socket.c index a733795..4ab34da 100644 --- a/src/lib/elementary/efl_ui_win_socket.c +++ b/src/lib/elementary/efl_ui_win_socket.c @@ -56,7 +56,7 @@ _efl_ui_win_socket_socket_listen(Eo *obj, Efl_Ui_Win_Socket_Data *pd EINA_UNUSED if (_elm_atspi_enabled()) { if (pd->socket_proxy) - efl_unref(pd->socket_proxy); + efl_del(pd->socket_proxy); pd->socket_proxy = _elm_atspi_bridge_utils_proxy_create(obj, svcname, svcnum, ELM_ATSPI_PROXY_TYPE_SOCKET); elm_atspi_bridge_utils_proxy_listen(pd->socket_proxy); } @@ -86,7 +86,7 @@ _access_socket_proxy_listen(Eo * obj) if (svcnum) free(svcnum); return; } - efl_unref(sd->socket_proxy); + efl_del(sd->socket_proxy); } sd->socket_proxy = _elm_atspi_bridge_utils_proxy_create(obj, svcname, atoi(svcnum), ELM_ATSPI_PROXY_TYPE_SOCKET); evas_object_data_set(obj, "___atspi_socket_proxy", sd->socket_proxy); @@ -100,12 +100,12 @@ _access_socket_proxy_listen(Eo * obj) void -_access_socket_proxy_unref(Eo * obj) +_access_socket_proxy_del(Eo * obj) { EFL_UI_WIN_SOCKET_DATA_GET(obj, sd); if (sd->socket_proxy) { - efl_unref(sd->socket_proxy); + efl_del(sd->socket_proxy); sd->socket_proxy = NULL; evas_object_data_set(obj, "___atspi_socket_proxy", NULL); } diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 8e8736a..67e220b 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -904,7 +904,7 @@ void elm_object_accessibility_highlight_set(void *obj, Eina_Bool Eina_Bool _elm_atspi_bridge_plug_id_split(const char *plug_id, char **bus, char **path); //TIZEN_ONLY(20170621) handle atspi proxy connection at runtime void _access_socket_proxy_listen(Eo * obj); -void _access_socket_proxy_unref(Eo * obj); +void _access_socket_proxy_del(Eo * obj); // // /* end of DEPRECATED */