From 561369d4460950facdbd7f0e3d09fdd06e10ff04 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Tue, 14 Nov 2017 15:54:49 +0100 Subject: [PATCH] elm: elm_atspi_bridge: ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN should use elm_atspi_bridge object @tizen_fix original patch: a097f1cb1c09d293168e79278a9d3f3f860065c5 Change-Id: I232e85786033a90468496c9dff4f894def46c62f --- src/lib/elementary/elm_atspi_bridge.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 053cecd..a333a2a 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -5211,7 +5211,16 @@ static void _socket_addr_get_cb(void *data, const Eldbus_Message *msg, Eldbus_Pe const char *bus, *path, *err, *txt; Eldbus_Message_Iter *iter, *iter_variant, *iter_struct; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(proxy, pd); + //TIZEN_ONLY(20171114) elm_atspi_bridge: ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN should use elm_atspi_bridge object + // ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(proxy, pd); + Eo *bridge = _elm_atspi_bridge_get(); + if (!bridge) + { + ERR("AT-SPI: Atspi bridge is not enabled."); + return; + } + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); + // if (eldbus_message_error_get(msg, &err, &txt)) { @@ -5408,7 +5417,16 @@ static void _proxy_interface_register(Eldbus_Connection *conn, Eo *proxy, const char *bus, const char *path) { Eldbus_Service_Interface *proxy_infc; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(proxy, pd); + //TIZEN_ONLY(20171114) elm_atspi_bridge: ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN should use elm_atspi_bridge object + // ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(proxy, pd); + Eo *bridge = _elm_atspi_bridge_get(); + if (!bridge) + { + ERR("AT-SPI: Atspi bridge is not enabled."); + return; + } + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); + // eldbus_name_request(conn, bus, ELDBUS_NAME_REQUEST_FLAG_DO_NOT_QUEUE, NULL, NULL); proxy_infc = eldbus_service_interface_register(pd->a11y_bus, path, &_proxy_iface_desc); if (!proxy_infc) -- 2.7.4