static Eldbus_Connection *conn;
static Eldbus_Service_Interface *service;
-static Eldbus_Pending *addr_req;
enum _Signals
{
goto fail_msg;
}
- if (!(addr_req = eldbus_connection_send(session, msg, _on_get_a11y_address, session, -1)))
+ if (!eldbus_connection_send(session, msg, _on_get_a11y_address, session, -1))
{
ERROR("Message send failed");
goto fail_send;
void dbus_gesture_adapter_shutdown(void)
{
- if (addr_req) eldbus_pending_cancel(addr_req);
if (service) eldbus_service_object_unregister(service);
if (conn) eldbus_connection_unref(conn);
conn = NULL;
- addr_req = NULL;
service = NULL;
eldbus_shutdown();
static int app_create(void *data)
{
- eldbus_init();
elm_init(0, NULL);
logger_init();
static int app_terminate(void *data)
{
- screen_reader_terminate_service(data);
+ DEBUG("screen reader terminating");
#ifndef SCREEN_READER_TV
+ DEBUG("terminate navigator");
navigator_shutdown();
+ DEBUG("terminate gestures");
screen_reader_gestures_shutdown();
#endif
-
- eldbus_shutdown();
+ DEBUG("terminate service");
+ screen_reader_terminate_service(data);
+ DEBUG("terminate logger");
logger_shutdown();
+ DEBUG("screen reader terminated");
return 0;
}
ecore_event_handler_del(hdlr);
}
- ecore_x_pointer_ungrab();
ecore_x_input_touch_devices_ungrab();
+ ecore_x_pointer_ungrab();
ecore_x_shutdown();
ecore_shutdown();
free(_e_mod_config);