parent
eb29a86306
commit
743bc86799
|
@ -298,7 +298,7 @@ _ecore_key_press(int event,
|
|||
tmp[val] = 0;
|
||||
|
||||
#ifndef X_HAVE_UTF8_STRING
|
||||
compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", tmp);
|
||||
compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", tmp);
|
||||
free(tmp);
|
||||
tmp = compose;
|
||||
#endif
|
||||
|
|
|
@ -58,9 +58,6 @@
|
|||
#include "ecore_private.h"
|
||||
#include "Ecore_X.h"
|
||||
|
||||
/* FIXME: this is for simulation only */
|
||||
#include "Ecore_Txt.h"
|
||||
|
||||
extern int _ecore_x11xcb_log_dom ;
|
||||
|
||||
#ifdef ECORE_XLIB_XCB_DEFAULT_LOG_COLOR
|
||||
|
|
|
@ -292,7 +292,7 @@ _ecore_key_press(int event, XKeyEvent *xevent)
|
|||
tmp[val] = 0;
|
||||
|
||||
#ifndef X_HAVE_UTF8_STRING
|
||||
compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", tmp);
|
||||
compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", tmp);
|
||||
free(tmp);
|
||||
tmp = compose;
|
||||
#endif
|
||||
|
@ -306,7 +306,7 @@ _ecore_key_press(int event, XKeyEvent *xevent)
|
|||
#ifdef X_HAVE_UTF8_STRING
|
||||
compose = compose_buffer;
|
||||
#else
|
||||
compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
|
||||
compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
|
||||
tmp = compose;
|
||||
#endif
|
||||
}
|
||||
|
@ -317,7 +317,7 @@ _ecore_key_press(int event, XKeyEvent *xevent)
|
|||
if (val > 0)
|
||||
{
|
||||
compose_buffer[val] = 0;
|
||||
compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
|
||||
compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
|
||||
tmp = compose;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -59,9 +59,6 @@
|
|||
#include "Ecore_X.h"
|
||||
#include "Ecore_Input.h"
|
||||
|
||||
/* FIXME: this is for simulation only */
|
||||
#include "Ecore_Txt.h"
|
||||
|
||||
extern int _ecore_xlib_log_dom;
|
||||
#ifdef ECORE_XLIB_DEFAULT_LOG_COLOR
|
||||
# undef ECORE_XLIB_DEFAULT_LOG_COLOR
|
||||
|
|
Loading…
Reference in New Issue