atspi: make possible to merge two atspi subtrees from different processes. 22/66322/9
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Wed, 6 May 2015 12:21:31 +0000 (14:21 +0200)
committerPrasoon Singh <prasoon.16@samsung.com>
Wed, 4 May 2016 08:23:48 +0000 (13:53 +0530)
commit15b749312eb34f5c47ca28d5ba05cb854c766046
treeafddb8288def223a20c76b5edd477a669c15255e
parent7699ae3c65f523e6a60dc6cd1fc2fe93e6aef5b5
atspi: make possible to merge two atspi subtrees from different processes.

Conflicts:
src/lib/elm_atspi_app_object.c
src/lib/elm_plug.eo
src/lib/elm_priv.h
src/lib/elm_web.eo
src/lib/elm_widget.h

Change-Id: I8291311bef3d257ccb29187095bd455db552cae6
13 files changed:
src/lib/Elementary.h.in
src/lib/Makefile.am
src/lib/elm_atspi_app_object.c
src/lib/elm_atspi_bridge.c
src/lib/elm_atspi_proxy.c [new file with mode: 0644]
src/lib/elm_atspi_proxy.eo [new file with mode: 0644]
src/lib/elm_atspi_proxy.h [new file with mode: 0644]
src/lib/elm_plug.c
src/lib/elm_plug.eo
src/lib/elm_priv.h
src/lib/elm_widget.c
src/lib/elm_widget.h
src/lib/elm_win.c