Revert "wayland_imf: Fix bug in shutdown"

This reverts commit fb01a697dd.

The problem this commit was anticipating never happened.

Now the next version of wayland will allow us to make protocol symbols
private, so it makes more sense to have this stuff back where it was
in the first place.
This commit is contained in:
Derek Foreman 2018-02-28 13:33:32 -06:00
parent d176a37f32
commit 976b0d24cc
2 changed files with 8 additions and 4 deletions

View File

@ -138,6 +138,14 @@ 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@ \

View File

@ -44,8 +44,6 @@ lib/ecore_wl2/xdg-shell-client-protocol.h \
lib/ecore_wl2/xdg-shell-protocol.c \
lib/ecore_wl2/xdg-shell-unstable-v6-client-protocol.h \
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/efl-hints-client-protocol.h \
lib/ecore_wl2/efl-hints-protocol.c
@ -73,8 +71,6 @@ lib/ecore_wl2/efl-aux-hints-client-protocol.h \
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/text-input-unstable-v1-client-protocol.h \
lib/ecore_wl2/text-input-unstable-v1-protocol.c \
lib/ecore_wl2/efl-hints-client-protocol.h \
lib/ecore_wl2/efl-hints-protocol.c