diff --git a/legacy/ecore/src/lib/ecore_x/Makefile.am b/legacy/ecore/src/lib/ecore_x/Makefile.am index 4f4e302ea5..9fe60570f5 100644 --- a/legacy/ecore/src/lib/ecore_x/Makefile.am +++ b/legacy/ecore/src/lib/ecore_x/Makefile.am @@ -2,11 +2,13 @@ INCLUDES = \ -I$(top_srcdir)/src/lib/ecore \ +-I$(top_srcdir)/src/lib/ecore_txt \ -I$(top_srcdir)/src/lib/ecore_job \ @x_cflags@ libecore_x_la_LDFLAGS = -version-info 1:0:0 \ -L$(top_builddir)/src/lib/ecore/.libs \ +-L$(top_builddir)/src/lib/ecore_txt/.libs -L$(top_builddir)/src/lib/ecore_job/.libs if BUILD_ECORE_X @@ -29,12 +31,14 @@ ecore_x_private.h libecore_x_la_LIBADD = \ $(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/ecore_job/libecore_txt.la \ $(top_builddir)/src/lib/ecore_job/libecore_job.la \ @x_ldflags@ \ @x_libs@ libecore_x_la_DEPENDENCIES = \ $(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/ecore_job/libecore_txt.la \ $(top_builddir)/src/lib/ecore_job/libecore_job.la endif diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/ecore_x_events.c index 399042dcfc..f643eddc86 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_events.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_events.c @@ -143,7 +143,7 @@ _ecore_x_event_handle_key_press(XEvent *xevent) if (val > 0) { buf[val] = 0; - e->key_compose = strdup(buf); + e->key_compose = ecore_txt_convert("LATIN1", "UTF-8", buf); } else e->key_compose = NULL; keyname = XKeysymToString(sym); @@ -194,7 +194,7 @@ _ecore_x_event_handle_key_release(XEvent *xevent) if (val > 0) { buf[val] = 0; - e->key_compose = strdup(buf); + e->key_compose = ecore_txt_convert("LATIN1", "UTF-8", buf); } else e->key_compose = NULL; keyname = XKeysymToString(sym);