From: englebass <englebass@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 2 Feb 2010 04:50:04 +0000 (+0000)
Subject: Remove Ecore_Txt
X-Git-Tag: build/2012-07-04.173327~2219
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a55a6691365e8b695e55381ebdacdd555ff30b6;p=profile%2Fivi%2Fecore.git

Remove Ecore_Txt

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@45791 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c
index 8aac26a..73ed581 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c
@@ -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
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_private.h b/src/lib/ecore_x/xcb/ecore_xcb_private.h
index 115b1fd..0416ea0 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/src/lib/ecore_x/xcb/ecore_xcb_private.h
@@ -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
diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c
index 5a34ef5..06aa81e 100644
--- a/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -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;
 	  }
      }
diff --git a/src/lib/ecore_x/xlib/ecore_x_private.h b/src/lib/ecore_x/xlib/ecore_x_private.h
index 51b77bf..3e0ec60 100644
--- a/src/lib/ecore_x/xlib/ecore_x_private.h
+++ b/src/lib/ecore_x/xlib/ecore_x_private.h
@@ -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