diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2017-04-10 14:44:33 -0500 |
|---|---|---|
| committer | Chris Michael <cp.michael@samsung.com> | 2017-04-11 11:51:50 -0400 |
| commit | fdb277fd86a8e488cf1530f0236ebd4a6f254907 (patch) | |
| tree | 23aa52f96c1e19d3aea56da721897e730775a434 | |
| parent | d449f779f11ca52b87df3d796d00e9030d11578b (diff) | |
| download | efl-fdb277fd86a8e488cf1530f0236ebd4a6f254907.tar.gz | |
wayland_imf: Fix bug in shutdown
Theoretical bug that may become real in the coming days - ecore_imf's
wayland module has the interface for the text input protocol. The
imf module gets unloaded after destroying the protocol object but
before receiving all events from the server destined for it.
Currently that's fine, but I've posted some wayland patches for
review that require the interface to remain present while the text
input object is a zombie. These patches cause some EFL apps to
crash on shutdown when they unmap the wayland imf module.
This moves the wayland interface bits into ecore_wl2 which doesn't
get unmapped.
| -rw-r--r-- | src/Makefile_Ecore_IMF.am | 8 | ||||
| -rw-r--r-- | src/Makefile_Ecore_Wl2.am | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/Makefile_Ecore_IMF.am b/src/Makefile_Ecore_IMF.am index 8b9c9e97df..001927fe62 100644 --- a/src/Makefile_Ecore_IMF.am +++ b/src/Makefile_Ecore_IMF.am @@ -135,14 +135,6 @@ modules/ecore_imf/wayland/wayland_module.c \ modules/ecore_imf/wayland/wayland_imcontext.c \ modules/ecore_imf/wayland/wayland_imcontext.h -nodist_modules_ecore_imf_wayland_module_la_SOURCES = \ -modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \ -modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c - -BUILT_SOURCES += \ -modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \ -modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c - modules_ecore_imf_wayland_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_builddir)/src/modules/ecore_imf/wayland \ @ECORE_IMF_CFLAGS@ \ diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am index bf05033622..69b4b6ccec 100644 --- a/src/Makefile_Ecore_Wl2.am +++ b/src/Makefile_Ecore_Wl2.am @@ -30,7 +30,9 @@ lib/ecore_wl2/www-protocol.c \ lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \ lib/ecore_wl2/linux-dmabuf-unstable-v1-client-protocol.h \ lib/ecore_wl2/xdg-shell-unstable-v6-client-protocol.h \ -lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c +lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c \ +lib/ecore_wl2/text-input-unstable-v1-client-protocol.h \ +lib/ecore_wl2/text-input-unstable-v1-protocol.c lib_ecore_wl2_libecore_wl2_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WL2_CFLAGS@ lib_ecore_wl2_libecore_wl2_la_LIBADD = @ECORE_WL2_LIBS@ @@ -49,6 +51,8 @@ BUILT_SOURCES += \ lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \ lib/ecore_wl2/linux-dmabuf-unstable-v1-client-protocol.h \ lib/ecore_wl2/session-recovery-protocol.c \ - lib/ecore_wl2/session-recovery-client-protocol.h + lib/ecore_wl2/session-recovery-client-protocol.h \ + lib/ecore_wl2/text-input-unstable-v1-client-protocol.h \ + lib/ecore_wl2/text-input-unstable-v1-protocol.c endif |